commit 3a52aee4dfccb74a982be59f4f057c5a9953d994
author Evan Rosky <erosky@google.com> Fri Jul 22 02:37:09 2022 +0000
committer Evan Rosky <erosky@google.com> Tue Jul 26 16:34:46 2022 +0000
tree 714122f087e0c9be9ff44a24873a5e5322c996d9
parent aa3a5a36bda4d2b891f833f09a86b8a23c876ff0

Continue deferring removal of activities in a transition

Otherwise its possible for transitions to become ready early
and trigger bad behavior (such as promoting up to displayarea).

Basically, this fixes a bug where isExitAnimationRunning was
returning false for windows in shell-transitions

Bug: 239887306
Test: full wipe, complete set-up wizard until homescreen
      or atest DigitsKeyListenerTest
Change-Id: Iba0454a27e65c976de00adb7ae94b1e0bfe9affc

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

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index fa78a2b..eac576b 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -137,7 +137,6 @@
 import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS;
 import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_STARTING_REVEAL;
 import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_WINDOW_ANIMATION;
-import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;
 import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;
 import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
 import static com.android.server.wm.WindowContainerChildProto.WINDOW;
@@ -4971,10 +4970,6 @@
                 || isAnimating(0 /* flags */, ANIMATION_TYPE_WINDOW_ANIMATION);
     }
 
-    boolean isExitAnimationRunningSelfOrChild() {
-        return isAnimating(CHILDREN, ANIMATION_TYPE_WINDOW_ANIMATION);
-    }
-
     private boolean shouldFinishAnimatingExit() {
         // Exit animation might be applied soon.
         if (inTransition()) {