DO NOT MERGE - Remove RetailDemoModeService

Bug: 62712426
Test: make -j100
Change-Id: I483f2e3518a48fbc833562e71c3acd17ad565881
Merged-In: I483f2e3518a48fbc833562e71c3acd17ad565881
This commit is contained in:
Christine Franks
2017-06-23 18:12:46 -07:00
parent 37a9991be9
commit b7c929977c
17 changed files with 12 additions and 1857 deletions

View File

@@ -100,7 +100,6 @@ import com.android.server.power.PowerManagerService;
import com.android.server.power.ShutdownThread;
import com.android.server.radio.RadioService;
import com.android.server.restrictions.RestrictionsManagerService;
import com.android.server.retaildemo.RetailDemoModeService;
import com.android.server.security.KeyAttestationApplicationIdProviderService;
import com.android.server.security.KeyChainSystemService;
import com.android.server.soundtrigger.SoundTriggerService;
@@ -1551,10 +1550,6 @@ public final class SystemServer {
mmsService = mSystemServiceManager.startService(MmsServiceBroker.class);
traceEnd();
traceBeginAndSlog("StartRetailDemoModeService");
mSystemServiceManager.startService(RetailDemoModeService.class);
traceEnd();
if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_AUTOFILL)) {
traceBeginAndSlog("StartAutoFillService");
mSystemServiceManager.startService(AUTO_FILL_MANAGER_SERVICE_CLASS);