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

2012-09-07 15:02:38 -07:00
parent 7c02632043 62df6eb508
commit d6a53c3156
1 changed files with 2 additions and 2 deletions
--- a/services/java/com/android/server/DevicePolicyManagerService.java
+++ b/services/java/com/android/server/DevicePolicyManagerService.java
@@ -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;