am a6f7e419: am 9baeff05: am 6eb14c30: PowerManagerService: Do not enable light sensor if hardware backlight management is being used.

Merge commit 'a6f7e41979cf34ab403c88b7c5521e1b5cfc442e'

* commit 'a6f7e41979cf34ab403c88b7c5521e1b5cfc442e':
  PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
This commit is contained in:
Mike Lockwood
2009-10-25 09:27:15 -07:00
committed by Android Git Automerger

View File

@@ -1286,7 +1286,7 @@ class PowerManagerService extends IPowerManager.Stub
private int setScreenStateLocked(boolean on) {
int err = Power.setScreenState(on);
if (err == 0) {
if (err == 0 && !mHasHardwareAutoBrightness) {
enableLightSensor(on && mAutoBrightessEnabled);
if (!on) {
// make sure button and key backlights are off too