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

Commit c2b9c538 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Gerrit Code Review
Browse files

Merge "Ensure state transition of paused activity."

parents 12dccb8a 9caeef72

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

+7 −4
Original line number Diff line number Diff line
@@ -941,7 +941,9 @@ final class ActivityStack { 
                        r.userId, System.identityHashCode(r), r.shortComponentName,

                        mPausingActivity != null

                            ? mPausingActivity.shortComponentName : "(none)");

                if (r.finishing && r.state == ActivityState.PAUSING) {

                if (r.state == ActivityState.PAUSING) {

                    r.state = ActivityState.PAUSED;

                    if (r.finishing) {

                        if (DEBUG_PAUSE) Slog.v(TAG,

                                "Executing finish of failed to pause activity: " + r);

                        finishCurrentActivityLocked(r, FINISH_AFTER_VISIBLE, false);
@@ -949,6 +951,7 @@ final class ActivityStack { 
                }

            }

        }

    }



    final void activityStoppedLocked(ActivityRecord r, Bundle icicle,

            PersistableBundle persistentState, CharSequence description) {