commit 6eb14c30387d9c13538887e54bc180a430b2ac40
author Mike Lockwood <lockwood@android.com> Sat Oct 24 19:43:38 2009 -0400
committer Mike Lockwood <lockwood@android.com> Sat Oct 24 19:43:38 2009 -0400
tree 3e45bfa45eb1c26e680afbe4fd6ac3c15c4e3fa4
parent bf96aaadd46fb5b0884070177faa16ec4f22e2ba

PowerManagerService: Do not enable light sensor if hardware backlight management is being used.

Change-Id: Ic652ac22ec3256d71d12504148927349dfbd3384
Signed-off-by: Mike Lockwood <lockwood@android.com>

services/java/com/android/server/PowerManagerService.java

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 @@
 
     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