Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo

Author: mikeandroid

services/java/com/android/server/PowerManagerService.java

@@ -1342,21 +1342,27 @@ public void preventScreenOn(boolean prevent) {
     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);
+                }
             }
         }
     }
 
     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);
+                }
             }
         }
     }