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

Commit c26aabad authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove replaced window if we aren't animating its exit." into nyc-dev

parents 9688c2ed d0a166a3

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

+2 −1
Original line number Diff line number Diff line
@@ -1586,11 +1586,12 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
                    win.transferDimToReplacement();

                }

                win.mWillReplaceWindow = false;

                final boolean animateReplacingWindow = win.mAnimateReplacingWindow;

                win.mAnimateReplacingWindow = false;

                win.mReplacingRemoveRequested = false;

                win.mReplacingWindow = null;

                mSkipEnterAnimationForSeamlessReplacement = false;

                if (win.mAnimatingExit) {

                if (win.mAnimatingExit || !animateReplacingWindow) {

                    mService.removeWindowInnerLocked(win);

                }

            }