diff options
| author | Craig Mautner <cmautner@google.com> | 2012-06-02 11:24:29 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-02 11:24:29 -0700 |
| commit | d672b241f6720201e3b8f613363d71e4291b8597 (patch) | |
| tree | aad7986a7dc8b7c29d29271a78598fa6561dd3e6 /services/java/com/android/server/PowerManagerService.java | |
| parent | dba86e2dc1e89760670817f16da1d1db04ca85f7 (diff) | |
| parent | d29568cf5f1d2ce22c0c3c5f32812b64bf958f63 (diff) | |
Merge "Fix power manager issues." into jb-dev
Diffstat (limited to 'services/java/com/android/server/PowerManagerService.java')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index 469b4f1dca4e..5aa0d16eac4d 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -2285,6 +2285,10 @@ public class PowerManagerService extends IPowerManager.Stub public void animateTo(int target, int sensorTarget, int mask, int animationDuration) { synchronized(this) { + if (isAnimating() && (mask ^ currentMask) != 0) { + // current animation is unrelated to new animation, jump to final values + cancelAnimation(); + } startValue = currentValue; endValue = target; startSensorValue = mHighestLightSensorValue; @@ -2409,7 +2413,8 @@ public class PowerManagerService extends IPowerManager.Stub private boolean isScreenTurningOffLocked() { return (mScreenBrightnessAnimator.isAnimating() - && mScreenBrightnessAnimator.endValue == PowerManager.BRIGHTNESS_OFF); + && mScreenBrightnessAnimator.endValue == PowerManager.BRIGHTNESS_OFF + && (mScreenBrightnessAnimator.currentMask & SCREEN_BRIGHT_BIT) != 0); } private boolean shouldLog(long time) { |