diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-10-25 09:04:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-25 09:04:50 -0700 |
| commit | 9baeff05a8bf9bd4479f2a357dca0463cc750202 (patch) | |
| tree | 90816cb1c5692d74fc4cc499fbe9b55743386065 /services/java | |
| parent | 7ed70c9515fe3df6eb1796717d73f23e7286b3e6 (diff) | |
| parent | 6eb14c30387d9c13538887e54bc180a430b2ac40 (diff) | |
| download | frameworks_base-9baeff05a8bf9bd4479f2a357dca0463cc750202.zip frameworks_base-9baeff05a8bf9bd4479f2a357dca0463cc750202.tar.gz frameworks_base-9baeff05a8bf9bd4479f2a357dca0463cc750202.tar.bz2 | |
am 6eb14c30: PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
Merge commit '6eb14c30387d9c13538887e54bc180a430b2ac40' into eclair-mr2
* commit '6eb14c30387d9c13538887e54bc180a430b2ac40':
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 |