Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8d1eeb21: am 2d155d26: PowerManagerService: Fix bug resulting in backlights turning on while screen is off.

Browse Source 
Merge commit '8d1eeb2144945365cae281552bd7bc5eb14f7688' into eclair-mr2-plus-aosp

* commit '8d1eeb2144945365cae281552bd7bc5eb14f7688':
  PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
This commit is contained in:
Mike Lockwood
2009-10-28 12:45:54 -07:00
committed by Android Git Automerger
parent e1da9d3583 8d1eeb2144
commit 80b6367dc6
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/java/com/android/server/PowerManagerService.java
View File

@@ -2037,16 +2037,21 @@ class PowerManagerService extends IPowerManager.Stub
} }
private void setScreenBrightnessMode(int mode) { private void setScreenBrightnessMode(int mode) {
mAutoBrightessEnabled = (mode == SCREEN_BRIGHTNESS_MODE_AUTOMATIC); boolean enabled = (mode == SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
// reset computed brightness if (mAutoBrightessEnabled != enabled) {
mLightSensorBrightness = -1; mAutoBrightessEnabled = enabled;
// reset computed brightness
mLightSensorBrightness = -1;
if (mHasHardwareAutoBrightness) { if (mHasHardwareAutoBrightness) {
// When setting auto-brightness, must reset the brightness afterwards // When setting auto-brightness, must reset the brightness afterwards
mHardware.setAutoBrightness_UNCHECKED(mAutoBrightessEnabled); mHardware.setAutoBrightness_UNCHECKED(enabled);
setBacklightBrightness((int)mScreenBrightness.curValue); if (screenIsOn()) {
} else { setBacklightBrightness((int)mScreenBrightness.curValue);
enableLightSensor(screenIsOn() && mAutoBrightessEnabled); }
} else {
enableLightSensor(screenIsOn() && enabled);
}
} }
} }