diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-06-10 15:30:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-10 15:30:33 -0700 |
| commit | 34502a84ebc11e3c8ab3dd0b8ecf1bf3282ab4b0 (patch) | |
| tree | 4810ccf58e89d620d765a7de6c9e0687418c7fb3 /services | |
| parent | f1bb929bc5d24842a5d2fd6906cd9ca48a759f6f (diff) | |
| parent | f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4 (diff) | |
| download | frameworks_base-34502a84ebc11e3c8ab3dd0b8ecf1bf3282ab4b0.zip frameworks_base-34502a84ebc11e3c8ab3dd0b8ecf1bf3282ab4b0.tar.gz frameworks_base-34502a84ebc11e3c8ab3dd0b8ecf1bf3282ab4b0.tar.bz2 | |
am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
Merge commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into froyo-plus-aosp
* commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4':
Don't adjust lights if screen or button brightness is changed when the screen is off.
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index b9021b0..493a348 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -1342,10 +1342,13 @@ class PowerManagerService extends IPowerManager.Stub public void setScreenBrightnessOverride(int brightness) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); + if (mSpew) Slog.d(TAG, "setScreenBrightnessOverride " + brightness); synchronized (mLocks) { if (mScreenBrightnessOverride != brightness) { mScreenBrightnessOverride = brightness; - updateLightsLocked(mPowerState, SCREEN_ON_BIT); + if (isScreenOn()) { + updateLightsLocked(mPowerState, SCREEN_ON_BIT); + } } } } @@ -1353,10 +1356,13 @@ class PowerManagerService extends IPowerManager.Stub public void setButtonBrightnessOverride(int brightness) { mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null); + if (mSpew) Slog.d(TAG, "setButtonBrightnessOverride " + brightness); synchronized (mLocks) { if (mButtonBrightnessOverride != brightness) { mButtonBrightnessOverride = brightness; - updateLightsLocked(mPowerState, BUTTON_BRIGHT_BIT | KEYBOARD_BRIGHT_BIT); + if (isScreenOn()) { + updateLightsLocked(mPowerState, BUTTON_BRIGHT_BIT | KEYBOARD_BRIGHT_BIT); + } } } } |