diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-06-10 15:28:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-10 15:28:31 -0700 |
| commit | f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4 (patch) | |
| tree | 71d62a9ed67b2f129cc29d152ebfcf99c3b2ae7d | |
| parent | 8f2ca788f369892370477212cf9e7a67721a8c16 (diff) | |
| parent | f527c715d7065d8cf6943c37dd5e721bd7a805cd (diff) | |
| download | base-f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4.tar.gz | |
Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo
| -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 b9021b005ec7..493a34826bd7 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); + } } } } |