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

Commit 2ae53bea authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge "Fix extra onStop when finishing after onCreate" into qt-dev 

am: 008483c0

Change-Id: I3981baeae3179677f1f80fd9db43cf6443940519
parents bcbd28d4 008483c0

core/java/android/app/ActivityThread.java

+1 −1
Original line number Diff line number Diff line
@@ -4549,7 +4549,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
        if (!show && !r.stopped) {

            performStopActivityInner(r, null /* stopInfo */, show, false /* saveState */,

                    false /* finalStateRequest */, "handleWindowVisibility");

        } else if (show && r.stopped) {

        } else if (show && r.getLifecycleState() == ON_STOP) {

            // If we are getting ready to gc after going to the background, well

            // we are back active so skip it.

            unscheduleGcIdler();