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

am d6a53c31: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace" into jb-mr1-dev

Browse Source 
* commit 'd6a53c3156fbfa63c88fad536cfac126eea6718d':
  Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace
This commit is contained in:
Christopher Tate
2012-09-07 15:05:53 -07:00
committed by Android Git Automerger
parent 07cdbadc17 d6a53c3156
commit 20779a1ace
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/DevicePolicyManagerService.java
View File

@@ -1628,8 +1628,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} else {
// Make sure KEEP_SCREEN_ON is disabled, since that
// would allow bypassing of the maximum time to lock.
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.STAY_ON_WHILE_PLUGGED_IN, 0);
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0);
}
mLastMaximumTimeToLock = timeMs;