Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 175cebd7 authored by George Mount's avatar George Mount Committed by android-build-merger
Browse files

Merge "Removed improper check on mCalledExitCoordinator." into nyc-dev am: 17470220 

am: 5e61e92f

* commit '5e61e92f':
  Removed improper check on mCalledExitCoordinator.

Change-Id: I2a1c1719f390a0f65787255857f467196352cd8b
parents b9017aa3 5e61e92f

core/java/android/app/ActivityTransitionState.java

+0 −3
Original line number Diff line number Diff line
@@ -239,9 +239,6 @@ class ActivityTransitionState { 
    public void onResume(Activity activity, boolean isTopOfTask) {

        // 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 (mCalledExitCoordinator == null) {

            return; // This is the called activity

        }

        if (isTopOfTask || mEnterTransitionCoordinator == null) {

            restoreExitedViews();

            restoreReenteringViews();