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
This commit is contained in:
Wale Ogunwale
2016-05-09 11:18:18 -07:00
parent d4bdf9ca7c
commit d0a166a37d

View File

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