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

Commit b3ad483f authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Ensure state transition of paused activity." am: c2b9c538 am: 11695e80 

am: 8d16a3dd

* commit '8d16a3dd':
  Ensure state transition of paused activity.
parents d2e6907e 8d16a3dd

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

+7 −4
Original line number Diff line number Diff line
@@ -993,7 +993,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);
@@ -1001,6 +1003,7 @@ final class ActivityStack { 
                }

            }

        }

    }



    final void activityStoppedLocked(ActivityRecord r, Bundle icicle,

            PersistableBundle persistentState, CharSequence description) {