From 3a52aee4dfccb74a982be59f4f057c5a9953d994 Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Fri, 22 Jul 2022 02:37:09 +0000 Subject: [PATCH] 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 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index fa78a2b4aad8c..eac576b2a3fae 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_APP_TRANSITIO 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 @@ class WindowState extends WindowContainer implements WindowManagerP || 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()) {