Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix power manager issues." into jb-dev

Browse Source
This commit is contained in:
Craig Mautner
2012-06-02 11:24:29 -07:00
committed by Android (Google) Code Review
parent dba86e2dc1 d29568cf5f
commit d672b241f6
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/PowerManagerService.java
View File

@@ -2285,6 +2285,10 @@ public class PowerManagerService extends IPowerManager.Stub
public void animateTo(int target, int sensorTarget, int mask, int animationDuration) { public void animateTo(int target, int sensorTarget, int mask, int animationDuration) {
synchronized(this) { synchronized(this) {
if (isAnimating() && (mask ^ currentMask) != 0) {
// current animation is unrelated to new animation, jump to final values
cancelAnimation();
}
startValue = currentValue; startValue = currentValue;
endValue = target; endValue = target;
startSensorValue = mHighestLightSensorValue; startSensorValue = mHighestLightSensorValue;
@@ -2409,7 +2413,8 @@ public class PowerManagerService extends IPowerManager.Stub
private boolean isScreenTurningOffLocked() { private boolean isScreenTurningOffLocked() {
return (mScreenBrightnessAnimator.isAnimating() return (mScreenBrightnessAnimator.isAnimating()
&& mScreenBrightnessAnimator.endValue == PowerManager.BRIGHTNESS_OFF); && mScreenBrightnessAnimator.endValue == PowerManager.BRIGHTNESS_OFF
&& (mScreenBrightnessAnimator.currentMask & SCREEN_BRIGHT_BIT) != 0);
} }
private boolean shouldLog(long time) { private boolean shouldLog(long time) {