From 0cbd9042d96c69f845a86e57c654aa547c0035d2 Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Wed, 15 Sep 2021 01:05:26 +0000 Subject: [PATCH] Revert "Fix a bad merge" This reverts commit 3f3f21406d3c2a9788754b7580cac3b812b46cf3. Reason for revert: Need a different approach to landing this. Perhaps can do it without merged-in Change-Id: I6971df7f99956afc0b27c0b2248df378666cedc8 Merged-In: I1138079b1ae05248cefa211e0597fd6723a8bbba --- .../core/java/com/android/server/wm/ActivityRecord.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 7f12fffa554ca..605cb8a088e7b 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -4934,12 +4934,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A * this has become invisible. */ private void postApplyAnimation(boolean visible) { - final boolean usingShellTransitions = - mAtmService.getTransitionController().getTransitionPlayer() != null; final boolean delayed = isAnimating(PARENTS | CHILDREN, ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_WINDOW_ANIMATION | ANIMATION_TYPE_RECENTS); - if (!delayed && !usingShellTransitions) { + if (!delayed) { // We aren't delayed anything, but exiting windows rely on the animation finished // callback being called in case the ActivityRecord was pretending to be delayed, // which we might have done because we were in closing/opening apps list. @@ -4958,8 +4956,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A // updated. // If we're becoming invisible, update the client visibility if we are not running an // animation. Otherwise, we'll update client visibility in onAnimationFinished. - if (visible || !isAnimating(PARENTS, ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS) - || usingShellTransitions) { + if (visible || !isAnimating(PARENTS, + ANIMATION_TYPE_APP_TRANSITION | ANIMATION_TYPE_RECENTS)) { setClientVisible(visible); }