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

Commit 564e703b authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge \\"Do not load exit animation again if window is already animating\\"... 

Merge \\"Do not load exit animation again if window is already animating\\" into nyc-mr1-dev am: 1156c52b
am: 53539ae5

Change-Id: I0865f3fedf3e5971ae8fb6716907fd8e81c8e6ec
parents ecd08c0d 53539ae5

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

+2 −1
Original line number Diff line number Diff line
@@ -3009,7 +3009,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;