diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-10-25 09:13:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-25 09:13:05 -0700 |
| commit | a6f7e41979cf34ab403c88b7c5521e1b5cfc442e (patch) | |
| tree | 14b013e754b585635406d249f2d3f35fa1dd7fb8 /services/java | |
| parent | 848f9c99af9c1f3fe0cc30717ea4c73e6fefb527 (diff) | |
| parent | 9baeff05a8bf9bd4479f2a357dca0463cc750202 (diff) | |
| download | frameworks_base-a6f7e41979cf34ab403c88b7c5521e1b5cfc442e.zip frameworks_base-a6f7e41979cf34ab403c88b7c5521e1b5cfc442e.tar.gz frameworks_base-a6f7e41979cf34ab403c88b7c5521e1b5cfc442e.tar.bz2 | |
am 9baeff05: am 6eb14c30: PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
Merge commit '9baeff05a8bf9bd4479f2a357dca0463cc750202' into eclair-mr2-plus-aosp
* commit '9baeff05a8bf9bd4479f2a357dca0463cc750202':
PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index b0c5950..45d03e6 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -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 |