Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Setting a system property when device goes into demo mode" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-20 20:52:45 +00:00
committed by Android (Google) Code Review
parent ae0aed951b 707a9fc002
commit 24db3ab8b9
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java
View File

@@ -51,6 +51,7 @@ import android.os.Message;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.provider.MediaStore; import android.provider.MediaStore;
@@ -78,6 +79,7 @@ public class RetailDemoModeService extends SystemService {
private static final String DEMO_USER_NAME = "Demo"; private static final String DEMO_USER_NAME = "Demo";
private static final String ACTION_RESET_DEMO = private static final String ACTION_RESET_DEMO =
"com.android.server.retaildemo.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_TURN_SCREEN_ON = 0;
private static final int MSG_INACTIVITY_TIME_OUT = 1; private static final int MSG_INACTIVITY_TIME_OUT = 1;
@@ -220,11 +222,15 @@ public class RetailDemoModeService extends SystemService {
if (mDeviceDemoModeUri.equals(uri)) { if (mDeviceDemoModeUri.equals(uri)) {
mDeviceInDemoMode = UserManager.isDeviceInDemoMode(getContext()); mDeviceInDemoMode = UserManager.isDeviceInDemoMode(getContext());
if (mDeviceInDemoMode) { if (mDeviceInDemoMode) {
SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "1");
mHandler.sendEmptyMessage(MSG_START_NEW_SESSION); mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);
} else if (mWakeLock.isHeld()) { } else {
SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "0");
if (mWakeLock.isHeld()) {
mWakeLock.release(); mWakeLock.release();
} }
} }
}
// If device is provisioned and left demo mode - run the cleanup in demo folder // If device is provisioned and left demo mode - run the cleanup in demo folder
if (!mDeviceInDemoMode && isDeviceProvisioned()) { if (!mDeviceInDemoMode && isDeviceProvisioned()) {
// Run on the bg thread to not block the fg thread // Run on the bg thread to not block the fg thread
@@ -470,6 +476,7 @@ public class RetailDemoModeService extends SystemService {
if (UserManager.isDeviceInDemoMode(getContext())) { if (UserManager.isDeviceInDemoMode(getContext())) {
mDeviceInDemoMode = true; mDeviceInDemoMode = true;
SystemProperties.set(SYSTEM_PROPERTY_RETAIL_DEMO_ENABLED, "1");
mHandler.sendEmptyMessage(MSG_START_NEW_SESSION); mHandler.sendEmptyMessage(MSG_START_NEW_SESSION);
} }
SettingsObserver settingsObserver = new SettingsObserver(mHandler); SettingsObserver settingsObserver = new SettingsObserver(mHandler);