b7c929977c60f0a33fc5bd8339ca7c1770f0980f - SHIFTPHONES/android_frameworks_base

commit	b7c929977c60f0a33fc5bd8339ca7c1770f0980f	[log] [tgz]
author	Christine Franks <christyfranks@google.com>	Fri Jun 23 18:12:46 2017 -0700
committer	Christine Franks <christyfranks@google.com>	Fri Jul 21 15:51:32 2017 +0000
tree	c128ce4f88f79b792cdbe8f83e52aa3ac7788b6f
parent	37a9991be98d7e5c9ab4ba102c4d29845fa94152 [diff]

DO NOT MERGE - Remove RetailDemoModeService

Bug: 62712426
Test: make -j100
Change-Id: I483f2e3518a48fbc833562e71c3acd17ad565881
Merged-In: I483f2e3518a48fbc833562e71c3acd17ad565881

core/java/android/provider/Settings.java[diff]
core/proto/android/providers/settings.proto[diff]
core/res/res/values/strings.xml[diff]
core/tests/coretests/src/android/provider/SettingsBackupTest.java[diff]
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java[diff]
services/Android.mk[diff]
services/core/java/com/android/server/power/PowerManagerService.java[diff]
services/java/com/android/server/SystemServer.java[diff]
services/profile-classes[diff]
services/retaildemo/Android.mk[Deleted - diff]
services/retaildemo/java/com/android/server/retaildemo/PreloadAppsInstaller.java[Deleted - diff]
services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java[Deleted - diff]
services/retaildemo/java/com/android/server/retaildemo/UserInactivityCountdownDialog.java[Deleted - diff]
services/tests/notification/Android.mk[diff]
services/tests/servicestests/Android.mk[diff]
services/tests/servicestests/src/com/android/server/retaildemo/PreloadAppsInstallerTest.java[Deleted - diff]
services/tests/servicestests/src/com/android/server/retaildemo/RetailDemoModeServiceTest.java[Deleted - diff]

17 files changed

tree: c128ce4f88f79b792cdbe8f83e52aa3ac7788b6f