commit 707a9fc0027b76942e07f3c1aca8ff3db46b719c
author Suprabh Shukla <suprabh@google.com> Tue Jul 19 17:32:15 2016 -0700
committer Suprabh Shukla <suprabh@google.com> Tue Jul 19 18:30:29 2016 -0700
tree 74c81afbe7fe78133fc29f7a0ae60d59dbb0f4b4
parent d87be076446d0687f31ef7fd8f80b52818466153

Setting a system property when device goes into demo mode

Need a system property so that init can listen to changes to
it and restrict the battery driver from charging the battery beyond
an optimal charge level when the device is in retail demo mode

Bug: 30230924
Change-Id: I277acf27a442ec8f37aac2b01a1a8e0164947a45

services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java

diff --git a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
index c351e73..3b63d93 100644
--- a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
+++ b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
@@ -51,6 +51,7 @@
 import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.SystemClock;
+import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.MediaStore;
@@ -78,6 +79,7 @@
     private static final String DEMO_USER_NAME = "Demo";
     private static final String ACTION_RESET_DEMO =
             "com.android.server.retaildemo.ACTION_RESET_DEMO";
+    private static final String SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED = "sys.retaildemo.enabled";
 
     private static final int MSG_TURN_SCREEN_ON = 0;
     private static final int MSG_INACTIVITY_TIME_OUT = 1;
@@ -220,9 +222,13 @@
             if (mDeviceDemoModeUri.equals(uri)) {
                 mDeviceInDemoMode = UserManager.isDeviceInDemoMode(getContext());
                 if (mDeviceInDemoMode) {
+                    SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "1");
                     mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);
-                } else if (mWakeLock.isHeld()) {
-                    mWakeLock.release();
+                } else {
+                    SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "0");
+                    if (mWakeLock.isHeld()) {
+                        mWakeLock.release();
+                    }
                 }
             }
             // If device is provisioned and left demo mode - run the cleanup in demo folder
@@ -470,6 +476,7 @@
 
         if (UserManager.isDeviceInDemoMode(getContext())) {
             mDeviceInDemoMode = true;
+            SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "1");
             mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);
         }
         SettingsObserver settingsObserver = new SettingsObserver(mHandler);