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

2017-01-18 23:24:44 +00:00
parent 32a16bada4 b189aa6cf8
commit 64a16be2ba
1 changed files with 2 additions and 1 deletions
--- a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
+++ b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
@@ -533,6 +533,8 @@ public class RetailDemoModeService extends SystemService {

        SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "1");
        mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);
+
+        registerBroadcastReceiver();
    }

    @Override
@@ -568,7 +570,6 @@ public class RetailDemoModeService extends SystemService {
            case PHASE_BOOT_COMPLETED:
                if (UserManager.isDeviceInDemoMode(getContext())) {
                    putDeviceInDemoMode();
-                    registerBroadcastReceiver();
                }
                break;
        }