commit f278c97449a89d2632f649b2b702efc57c697c76
author Filip Gruszczynski <gruszczy@google.com> Tue Nov 10 04:23:56 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 10 04:23:56 2015 +0000
tree 5354e62ce5b0d6a353a470858f49aa1e22e759bb
parent 7422a3743462dd60806e3275f6517fcf66ce2aea
parent 291fdb0efc6eea850cda20c1a112249f3f36fcb2

Merge "Don't treat dummy animation as exit animation."

services/core/java/com/android/server/wm/WindowManagerService.java

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 05e88ca..e98333e 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 @@
                     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.