diff options
| author | Craig Mautner <cmautner@google.com> | 2012-05-31 10:03:32 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2012-05-31 10:03:32 -0700 |
| commit | af01fe02150bbcfec12f280029b3d71778f8b956 (patch) | |
| tree | 95e33db3a871d84f2c4f3291fe5ef3b03ba9b110 /services | |
| parent | 817a243c3be0920cfc0707c260e51c746bd26e01 (diff) | |
| download | frameworks_base-af01fe02150bbcfec12f280029b3d71778f8b956.zip frameworks_base-af01fe02150bbcfec12f280029b3d71778f8b956.tar.gz frameworks_base-af01fe02150bbcfec12f280029b3d71778f8b956.tar.bz2 | |
Fix initial brightness state after startup.
Setting of mInitialAnimation member was assuming that currentValue
member would only be 0 at boot. It also gets set to 0 when the
sensor goes dark. This fix removes mInitialValue reliance on
currentValue.
Fixes bug 6444319.
Change-Id: I27069f1b44f1f727533d34bbecad2e5aeaa7aab8
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index 38e08ae..469b4f1 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -2242,7 +2242,9 @@ public class PowerManagerService extends IPowerManager.Stub } else { newValue = endValue; mHighestLightSensorValue = endSensorValue; - mInitialAnimation = false; + if (endValue > 0) { + mInitialAnimation = false; + } } if (mDebugLightAnimation) { @@ -2290,7 +2292,7 @@ public class PowerManagerService extends IPowerManager.Stub currentMask = mask; duration = (int) (mWindowScaleAnimation * animationDuration); startTimeMillis = SystemClock.elapsedRealtime(); - mInitialAnimation = currentValue == 0 && target > 0; + mInitialAnimation = mInitialAnimation && target > 0; if (mDebugLightAnimation) { Slog.v(TAG, "animateTo(target=" + target @@ -2608,7 +2610,8 @@ public class PowerManagerService extends IPowerManager.Stub } }; - private boolean mInitialAnimation; // used to prevent lightsensor changes while turning on + /** used to prevent lightsensor changes while turning on. */ + private boolean mInitialAnimation = true; private void dockStateChanged(int state) { synchronized (mLocks) { |