From 716b33e32370af25a37b478af94808cc21e1fd96 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Tue, 26 Jul 2022 21:18:24 +0000
Subject: [PATCH] Revert "Clear mEnterTransitionCoordinator after content
 shows."

This reverts commit 8aef548893f7fbf57f7cd3fa179ef88ed69e80c8.

Fixes: 239497474
Fixes: 239595736
Fixes: 240211711

Reason for revert: b/240211711 b/239595736 b/239497474

Change-Id: I3b13b49c91d38055b3e5b9d772dfe21e054911b6
---
 core/java/android/app/ActivityTransitionState.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/core/java/android/app/ActivityTransitionState.java b/core/java/android/app/ActivityTransitionState.java
index 57dacd024ba16..877e7d3b3bf7f 100644
--- a/core/java/android/app/ActivityTransitionState.java
+++ b/core/java/android/app/ActivityTransitionState.java
@@ -263,11 +263,6 @@ class ActivityTransitionState {
         // After orientation change, the onResume can come in before the top Activity has
         // left, so if the Activity is not top, wait a second for the top Activity to exit.
         if (mEnterTransitionCoordinator == null || activity.isTopOfTask()) {
-            if (mEnterTransitionCoordinator != null) {
-                mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {
-                    mEnterTransitionCoordinator = null;
-                });
-            }
             restoreExitedViews();
             restoreReenteringViews();
         } else {
@@ -276,11 +271,6 @@ class ActivityTransitionState {
                 public void run() {
                     if (mEnterTransitionCoordinator == null ||
                             mEnterTransitionCoordinator.isWaitingForRemoteExit()) {
-                        if (mEnterTransitionCoordinator != null) {
-                            mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {
-                                mEnterTransitionCoordinator = null;
-                            });
-                        }
                         restoreExitedViews();
                         restoreReenteringViews();
                     } else if (mEnterTransitionCoordinator.isReturning()) {