Merge "Don't turn the button backlights on if the screen is off. Part 2." into gingerbread

2010-10-25 18:48:08 -07:00
parent 3d40cd5055 06eb33acb7
commit 11e2e9b0c2
1 changed files with 8 additions and 0 deletions
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -2354,6 +2354,14 @@ class PowerManagerService extends IPowerManager.Stub
            Slog.d(TAG, "lightSensorChangedLocked " + value);
        }

+        // Don't do anything if the screen is off.
+        if ((mPowerState & SCREEN_ON_BIT) == 0) {
+            if (mDebugLightSensor) {
+                Slog.d(TAG, "dropping lightSensorChangedLocked because screen is off");
+            }
+            return;
+        }
+
        // do not allow light sensor value to decrease
        if (mHighestLightSensorValue < value) {
            mHighestLightSensorValue = value;