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

Commit 5a8e2b21 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

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

am: c26aabad

* commit 'c26aabad':
  Remove replaced window if we aren't animating its exit.

Change-Id: I160f49ab3b0bf1ea77f38a1cbc0ae493577860d4
parents 17dcb562 c26aabad

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

                }

            }