From b189aa6cf86c94240732ce58f6404307a0a0fcf4 Mon Sep 17 00:00:00 2001
From: Christine Franks <christyfranks@google.com>
Date: Wed, 18 Jan 2017 09:37:15 -0800
Subject: [PATCH] DO NOT MERGE - Fix demo mode reset notification

Bug: 34358856
Test: manually verified that tapping the Reset notification
triggers a reset after initial provisioning.

Change-Id: I7cf4db729384630a85b22ca9b4947198974a8fbf
---
 .../com/android/server/retaildemo/RetailDemoModeService.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
index 8c2ee25a8017e..8a04d26d2b400 100644
--- 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;
         }