diff options
| author | Craig Mautner <cmautner@google.com> | 2012-05-31 13:07:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-31 13:07:03 -0700 |
| commit | a13b4da68d8df0977c8dec5001de7c9ecea71d9e (patch) | |
| tree | 14bc671a1707ff4c742b8afb0d5c3009d56ea5b6 /services | |
| parent | ce9b5c7611954fba91f4983bd41c0507b9931046 (diff) | |
| parent | af01fe02150bbcfec12f280029b3d71778f8b956 (diff) | |
| download | frameworks_base-a13b4da68d8df0977c8dec5001de7c9ecea71d9e.zip frameworks_base-a13b4da68d8df0977c8dec5001de7c9ecea71d9e.tar.gz frameworks_base-a13b4da68d8df0977c8dec5001de7c9ecea71d9e.tar.bz2 | |
Merge "Fix initial brightness state after startup." into jb-dev
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) { |