diff options
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowAnimator.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java index 6fdd535..008d2fc 100644 --- a/services/core/java/com/android/server/wm/WindowAnimator.java +++ b/services/core/java/com/android/server/wm/WindowAnimator.java @@ -284,7 +284,7 @@ public class WindowAnimator { } else if (mKeyguardGoingAway && !nowAnimating) { // Timeout!! Slog.e(TAG, "Timeout waiting for animation to startup"); - mPolicy.startKeyguardExitAnimation(0); + mPolicy.startKeyguardExitAnimation(0, 0); mKeyguardGoingAway = false; } if (win.isReadyForDisplay()) { @@ -392,7 +392,9 @@ public class WindowAnimator { winAnimator.mAnimationIsEntrance = true; if (startKeyguardExit) { // Do one time only. - mPolicy.startKeyguardExitAnimation(a.getStartOffset()); + mPolicy.startKeyguardExitAnimation(mCurrentTime + a.getStartOffset(), + a.getDuration()); + mKeyguardGoingAway = false; startKeyguardExit = false; } } |