diff options
| author | Christopher Tate <ctate@google.com> | 2012-09-07 14:22:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-07 14:22:59 -0700 |
| commit | c0be8c85b09002359adb1fb20f2bf08e6983d146 (patch) | |
| tree | afa797cab8f96f35d1be8bfeb7d0e934bdf99fa4 /services | |
| parent | 649d0d71b245d88746b78399ffa1f75da7c80974 (diff) | |
| parent | ad7353204152389e88b331991274bad04469ae58 (diff) | |
| download | frameworks_base-c0be8c85b09002359adb1fb20f2bf08e6983d146.zip frameworks_base-c0be8c85b09002359adb1fb20f2bf08e6983d146.tar.gz frameworks_base-c0be8c85b09002359adb1fb20f2bf08e6983d146.tar.bz2 | |
Merge "Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace" into jb-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/power/PowerManagerService.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/services/java/com/android/server/power/PowerManagerService.java b/services/java/com/android/server/power/PowerManagerService.java index 59d0954..fda619c 100644 --- a/services/java/com/android/server/power/PowerManagerService.java +++ b/services/java/com/android/server/power/PowerManagerService.java @@ -372,8 +372,8 @@ public final class PowerManagerService extends IPowerManager.Stub Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP), false, mSettingsObserver); resolver.registerContentObserver(Settings.System.getUriFor( Settings.System.SCREEN_OFF_TIMEOUT), false, mSettingsObserver); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.STAY_ON_WHILE_PLUGGED_IN), false, mSettingsObserver); + resolver.registerContentObserver(Settings.Global.getUriFor( + Settings.Global.STAY_ON_WHILE_PLUGGED_IN), false, mSettingsObserver); resolver.registerContentObserver(Settings.System.getUriFor( Settings.System.SCREEN_BRIGHTNESS), false, mSettingsObserver); resolver.registerContentObserver(Settings.System.getUriFor( @@ -405,8 +405,8 @@ public final class PowerManagerService extends IPowerManager.Stub Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 0) != 0); mScreenOffTimeoutSetting = Settings.System.getInt(resolver, Settings.System.SCREEN_OFF_TIMEOUT, DEFAULT_SCREEN_OFF_TIMEOUT); - mStayOnWhilePluggedInSetting = Settings.System.getInt(resolver, - Settings.System.STAY_ON_WHILE_PLUGGED_IN, + mStayOnWhilePluggedInSetting = Settings.Global.getInt(resolver, + Settings.Global.STAY_ON_WHILE_PLUGGED_IN, BatteryManager.BATTERY_PLUGGED_AC); final int oldScreenBrightnessSetting = mScreenBrightnessSetting; @@ -1585,8 +1585,8 @@ public final class PowerManagerService extends IPowerManager.Stub } private void setStayOnSettingInternal(int val) { - Settings.System.putInt(mContext.getContentResolver(), - Settings.System.STAY_ON_WHILE_PLUGGED_IN, val); + Settings.Global.putInt(mContext.getContentResolver(), + Settings.Global.STAY_ON_WHILE_PLUGGED_IN, val); } /** |