Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 631cf9cd authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am b946ce96: am 00fe1b65: am 4cd72169: Fix window animation flickering

* commit 'b946ce96':
  Fix window animation flickering
parents 537cd82a b946ce96
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -500,7 +500,13 @@ public class WindowAnimator {
                        mPostKeyguardExitAnimation.getStartOffset(),
                        mPostKeyguardExitAnimation.getDuration());
                mKeyguardGoingAway = false;
            } else if (mPostKeyguardExitAnimation.hasEnded()) {
            }
            // mPostKeyguardExitAnimation might either be ended normally, cancelled, or "orphaned",
            // meaning that the window it was running on was removed. We check for hasEnded() for
            // ended normally and cancelled case, and check the time for the "orphaned" case.
            else if (mPostKeyguardExitAnimation.hasEnded()
                    || mCurrentTime - mPostKeyguardExitAnimation.getStartTime()
                            > mPostKeyguardExitAnimation.getDuration()) {
                // Done with the animation, reset.
                if (DEBUG_KEYGUARD) Slog.v(TAG, "Done with Keyguard exit animations.");
                mPostKeyguardExitAnimation = null;