diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowState.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index 7341e1ea1b8c..e42a0d16b5ef 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -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); } } |