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

Commit 061846d1 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android Git Automerger
Browse files

am ec565efe: am eb2153c7: am 093d8de2: Merge "Finish already paused activity... 

am ec565efe: am eb2153c7: am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

* commit 'ec565efe':
  Finish already paused activity if it should be finished after pausing
parents 266576c1 ec565efe

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