Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE - Fix demo mode reset notification" into nyc-mr2-dev

Browse Source
This commit is contained in:
Christine Franks
2017-01-18 23:24:44 +00:00
committed by Android (Google) Code Review
parent 32a16bada4 b189aa6cf8
commit 64a16be2ba
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
View File

@@ -533,6 +533,8 @@ public class RetailDemoModeService extends SystemService {
SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "1"); SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "1");
mHandler.sendEmptyMessage(MSG_START_NEW_SESSION); mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);
registerBroadcastReceiver();
} }
@Override @Override
@@ -568,7 +570,6 @@ public class RetailDemoModeService extends SystemService {
case PHASE_BOOT_COMPLETED: case PHASE_BOOT_COMPLETED:
if (UserManager.isDeviceInDemoMode(getContext())) { if (UserManager.isDeviceInDemoMode(getContext())) {
putDeviceInDemoMode(); putDeviceInDemoMode();
registerBroadcastReceiver();
} }
break; break;
} }