Merge "Set RetailDemoModeService#mDeviceInDemoMode to false"

2017-02-06 18:43:00 +00:00
parent 96c44c48ac c07ec63c94
commit b0a820fbf0
1 changed files with 2 additions and 0 deletions
--- a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
+++ b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
@@ -541,6 +541,8 @@ public class RetailDemoModeService extends SystemService {
    }

    private void stopDemoMode() {
+        mDeviceInDemoMode = false;
+        mIsCarrierDemoMode = false;
        mPreloadAppsInstaller = null;
        mCameraIdsWithFlash = null;
        mInjector.destroyWakeLock();