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

Commit 093d8de2 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

parents 0bd08fc2 3f529ee7

services/core/java/com/android/server/am/ActivityStack.java

+8 −2
Original line number Diff line number Diff line
@@ -2669,8 +2669,13 @@ final class ActivityStack { 
            if (!r.finishing) {

                if (!mService.isSleeping()) {

                    if (DEBUG_STATES) Slog.d(TAG_STATES, "no-history finish of " + r);

                    requestFinishActivityLocked(r.appToken, Activity.RESULT_CANCELED, null,

                            "stop-no-history", false);

                    if (requestFinishActivityLocked(r.appToken, Activity.RESULT_CANCELED, null,

                            "stop-no-history", false)) {

                        // Activity was finished, no need to continue trying to schedule stop.

                        adjustFocusedActivityLocked(r, "stopActivityFinished");

                        r.resumeKeyDispatchingLocked();

                        return;

                    }

                } else {

                    if (DEBUG_STATES) Slog.d(TAG_STATES, "Not finishing noHistory " + r

                            + " on stop because we're just sleeping");
@@ -2963,6 +2968,7 @@ final class ActivityStack { 
        r.state = ActivityState.FINISHING;



        if (mode == FINISH_IMMEDIATELY

                || (mode == FINISH_AFTER_PAUSE && prevState == ActivityState.PAUSED)

                || prevState == ActivityState.STOPPED

                || prevState == ActivityState.INITIALIZING) {

            // If this activity is already stopped, we can just finish