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

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

Browse Source 
Merge commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec' into eclair-mr2

* commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec':
  PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
This commit is contained in:
Mike Lockwood
2009-10-28 11:41:10 -07:00
committed by Android Git Automerger
parent 7c64d4486a 2d155d264e
commit 8d1eeb2144
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) {
mAutoBrightessEnabled = (mode == SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
// reset computed brightness
mLightSensorBrightness = -1;
boolean enabled = (mode == SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
if (mAutoBrightessEnabled != enabled) {
mAutoBrightessEnabled = enabled;
// reset computed brightness
mLightSensorBrightness = -1;
if (mHasHardwareAutoBrightness) {
// When setting auto-brightness, must reset the brightness afterwards
mHardware.setAutoBrightness_UNCHECKED(mAutoBrightessEnabled);
setBacklightBrightness((int)mScreenBrightness.curValue);
} else {
enableLightSensor(screenIsOn() && mAutoBrightessEnabled);
if (mHasHardwareAutoBrightness) {
// When setting auto-brightness, must reset the brightness afterwards
mHardware.setAutoBrightness_UNCHECKED(enabled);
if (screenIsOn()) {
setBacklightBrightness((int)mScreenBrightness.curValue);
}
} else {
enableLightSensor(screenIsOn() && enabled);
}
}
}