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

Commit f55691e0 authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

Merge "Check if last resumed activity is null before resuming." into pi-dev am: 01e4949f

am: 4d5b6f7d

Change-Id: Iff97ec8fcfc512ecfd50f43ad001a262b7434482
parents f1a183b0 4d5b6f7d
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -2707,9 +2707,12 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
                    if (DEBUG_STATES) Slog.v(TAG_STATES, "Resume failed; resetting state to "
                            + lastState + ": " + next);
                    next.setState(lastState, "resumeTopActivityInnerLocked");
                    if (lastStack != null) {

                    // lastResumedActivity being non-null implies there is a lastStack present.
                    if (lastResumedActivity != null) {
                        lastResumedActivity.setState(RESUMED, "resumeTopActivityInnerLocked");
                    }

                    Slog.i(TAG, "Restarting because process died: " + next);
                    if (!next.hasBeenLaunched) {
                        next.hasBeenLaunched = true;