From c07ec63c945d909bb592f30b0d6172af5fed35ca Mon Sep 17 00:00:00 2001
From: Justin Klaassen <justinklaassen@google.com>
Date: Mon, 6 Feb 2017 08:40:35 -0800
Subject: Set RetailDemoModeService#mDeviceInDemoMode to false

Reset mDeviceInDemoMode when the device exits demo mode. This isn't a
supported configuration in the production devices, but it's used for CTS
in order to run tests back-to-back without reprovisioning the device.

Fixes: 34938521
Test: RetailDemoModeServiceTest
Change-Id: I5a7134815b2817e7b02b1a2df71932faee967e8d
---
 .../java/com/android/server/retaildemo/RetailDemoModeService.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
index f30c466e5bbb..f943ee2c09bf 100644
--- 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();
-- 
cgit v1.2.3-59-g8ed1b