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

Commit cd709833 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "Do not clear exiting flag following explicit remove."

parents 506e47fc 7fed68d1
Loading
Loading
Loading
Loading
+6 −1
Original line number Original line Diff line number Diff line
@@ -1197,7 +1197,12 @@ class WindowSurfacePlacer {
                    // if app window is removed, or window relayout to invisible. We don't want to
                    // if app window is removed, or window relayout to invisible. We don't want to
                    // clear it out for windows that get replaced, because the animation depends on
                    // clear it out for windows that get replaced, because the animation depends on
                    // the flag to remove the replaced window.
                    // the flag to remove the replaced window.
                    if (!win.mWillReplaceWindow) {
                    //
                    // We also don't clear the mExiting flag for windows which have the
                    // mRemoveOnExit flag. This indicates an explicit remove request has been issued
                    // by the client. We should let animation proceed and not clear this flag or
                    // they won't eventually be removed by WindowStateAnimator#finishExit.
                    if (!win.mWillReplaceWindow && !win.mRemoveOnExit) {
                        win.mExiting = false;
                        win.mExiting = false;
                    }
                    }
                    if (win.mWinAnimator.mAnimLayer > layer) {
                    if (win.mWinAnimator.mAnimLayer > layer) {