summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2009-10-24 19:43:38 -0400
committerMike Lockwood <lockwood@android.com>2009-10-24 19:43:38 -0400
commit6eb14c30387d9c13538887e54bc180a430b2ac40 (patch)
tree3e45bfa45eb1c26e680afbe4fd6ac3c15c4e3fa4 /services
parentbf96aaadd46fb5b0884070177faa16ec4f22e2ba (diff)
downloadframeworks_base-6eb14c30387d9c13538887e54bc180a430b2ac40.zip
frameworks_base-6eb14c30387d9c13538887e54bc180a430b2ac40.tar.gz
frameworks_base-6eb14c30387d9c13538887e54bc180a430b2ac40.tar.bz2
PowerManagerService: Do not enable light sensor if hardware backlight management is being used.
Change-Id: Ic652ac22ec3256d71d12504148927349dfbd3384 Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/PowerManagerService.java2
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