Merge "LCD Brightness - continued change to allow lcd dimming in both…

… docked and undocked modes. It does not make sence to not allow screen to dim in either instance. Better options are welcome." into ics
arichards5 · Jan 14, 2012 · dd89f7f · dd89f7f
2 parents aabc20c + 5a63233
commit dd89f7f
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
@@ -2699,12 +2699,7 @@ private void lightSensorChangedLocked(int value) {
         if (mLightSensorValue != value) {
             mLightSensorValue = value;
             if ((mPowerState & BATTERY_LOW_BIT) == 0) {
-                // use maximum light sensor value seen since screen went on for LCD to avoid flicker
-                // we only do this if we are docked, since lighting should be stable when
-                // stationary in a dock.
-                int lcdValue = getAutoBrightnessValue(
-                        (!mIsDocked ? value : mHighestLightSensorValue),
-                        mLastLcdValue,
+                int lcdValue = getAutoBrightnessValue(value, mLastLcdValue,
                         (mCustomLightEnabled ? mCustomLightLevels : mAutoBrightnessLevels),
                         (mCustomLightEnabled ? mCustomLcdValues : mLcdBacklightValues));