Merge "Revert "Clear mEnterTransitionCoordinator after content shows."" into tm-qpr-dev (283b8e86) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityTransitionState.java

+0 −10

Original line number	Diff line number	Diff line
		@@ -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()) {