diff options
| author | Benjamin Franz <bfranz@google.com> | 2015-03-11 15:43:06 +0000 |
|---|---|---|
| committer | Benjamin Franz <bfranz@google.com> | 2015-03-13 09:44:44 +0000 |
| commit | 68cc42009e656b785420c531e39c131bbe6729cf (patch) | |
| tree | 95c34ba1e73d2d43f3dce7da9eda2f6621f7af01 /core | |
| parent | c6ee744a90a4a84df93b6631ca7df8736ef320e1 (diff) | |
| download | frameworks_base-68cc42009e656b785420c531e39c131bbe6729cf.zip frameworks_base-68cc42009e656b785420c531e39c131bbe6729cf.tar.gz frameworks_base-68cc42009e656b785420c531e39c131bbe6729cf.tar.bz2 | |
Allow DO to set Settings.Global.STAY_ON_WHILE_PLUGGED_IN
Bug: 19704419
Change-Id: I3fc970eae8ef947775b6b565916bb245dea1b43b
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index e23ffe4..245db06 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3562,6 +3562,9 @@ public class DevicePolicyManager { * Changing this setting has not effect as of {@link android.os.Build.VERSION_CODES#MNC}. Use * {@link android.net.wifi.WifiManager#setWifiEnabled(boolean)} instead.</li> * <li>{@link Settings.Global#WIFI_SLEEP_POLICY}</li> + * <li>{@link Settings.Global#STAY_ON_WHILE_PLUGGED_IN} + * This setting is only available from {@link android.os.Build.VERSION_CODES#MNC} onwards + * and can only be set if {@link #setMaximumTimeToLock} is not used to set a timeout.</li> * </ul> * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. |