From 291fdb0efc6eea850cda20c1a112249f3f36fcb2 Mon Sep 17 00:00:00 2001 From: Filip Gruszczynski Date: Mon, 9 Nov 2015 18:17:07 -0800 Subject: [PATCH] Don't treat dummy animation as exit animation. This fixes a problem where recents would never be removed, because they would run a dummy animation. Bug: 25472312 Change-Id: I5767dc700966a49513e6338f4728c2ff275628ad --- .../core/java/com/android/server/wm/WindowManagerService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 05e88caf7bd47..e98333e77d919 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2242,7 +2242,8 @@ public class WindowManagerService extends IWindowManager.Stub mAccessibilityController.onWindowTransitionLocked(win, transit); } } - final boolean isAnimating = win.mWinAnimator.isAnimating(); + final boolean isAnimating = win.mWinAnimator.isAnimating() + && !win.mWinAnimator.isDummyAnimation(); // The starting window is the last window in this app token and it isn't animating. // Allow it to be removed now as there is no additional window or animation that will // trigger its removal.