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

Commit d0a166a3 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Remove replaced window if we aren't animating its exit. 

Allow removal of replaced window if it isn't running an exit animation
and wasn't set to run an exit animation.

Bug: 28411852
Change-Id: I916d7c9461691bc58367d012113fefe9c6485127
parent d4bdf9ca

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);

                }

            }