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

Commit 1156c52b authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "Do not load exit animation again if window is already animating" into nyc-mr1-dev

parents 411b9c69 8c5d422e

services/core/java/com/android/server/wm/WindowManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -3003,7 +3003,8 @@ public class WindowManagerService extends IWindowManager.Stub 
        if (win.mAttrs.type == TYPE_APPLICATION_STARTING) {

            transit = WindowManagerPolicy.TRANSIT_PREVIEW_DONE;

        }

        if (win.isWinVisibleLw() && winAnimator.applyAnimationLocked(transit, false)) {

        if (win.isWinVisibleLw() && !winAnimator.isAnimationSet()

                && winAnimator.applyAnimationLocked(transit, false)) {

            focusMayChange = isDefaultDisplay;

            win.mAnimatingExit = true;

            win.mWinAnimator.mAnimating = true;