diff options
| author | 2016-01-08 01:02:46 +0000 | |
|---|---|---|
| committer | 2016-01-08 01:02:46 +0000 | |
| commit | b34f48ff7153ea84eaf0e96fa31286af10fea287 (patch) | |
| tree | f562d181bc1d59f18c8c35c519cd724a8db3d607 | |
| parent | b5c1f3b4dec45b1872b3de96c9af87cba708acda (diff) | |
| parent | 8aa603d830950e40c0224e7f5900275ff29383a8 (diff) | |
Merge "Correct exit animation window retention logic."
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 3f57c55cc51b..45e28e1a25eb 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2229,9 +2229,8 @@ public class WindowManagerService extends IWindowManager.Stub // trigger its removal. final boolean lastWinStartingNotAnimating = startingWindow && appToken!= null && appToken.allAppWindows.size() == 1 && !isAnimating; - if (!lastWinStartingNotAnimating && (win.mExiting || isAnimating)) { + if (!lastWinStartingNotAnimating && win.mExiting) { // The exit animation is running... wait for it! - win.mExiting = true; win.mRemoveOnExit = true; win.setDisplayLayoutNeeded(); final boolean focusChanged = updateFocusedWindowLocked( |