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

Commit c01a03bf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Only check isTopOfTask() when needed"

parents 3f4fcd0a 64643f6d

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -1768,7 +1768,7 @@ public class Activity extends ContextThemeWrapper 
    protected void onResume() {

        if (DEBUG_LIFECYCLE) Slog.v(TAG, "onResume " + this);

        dispatchActivityResumed();

        mActivityTransitionState.onResume(this, isTopOfTask());

        mActivityTransitionState.onResume(this);

        enableAutofillCompatibilityIfNeeded();

        if (mAutoFillResetNeeded) {

            if (!mAutoFillIgnoreFirstResumePause) {

core/java/android/app/ActivityTransitionState.java

+2 −2
Original line number Diff line number Diff line
@@ -258,10 +258,10 @@ class ActivityTransitionState { 
        }

    }



    public void onResume(Activity activity, boolean isTopOfTask) {

    public void onResume(Activity activity) {

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

        if (mEnterTransitionCoordinator == null || activity.isTopOfTask()) {

            restoreExitedViews();

            restoreReenteringViews();

        } else {