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

Commit 4c401380 authored by Bryce Lee's avatar Bryce Lee
Browse files

Check if last resumed activity is null before resuming. 

Previous implementation did not encounter this issue as the resumed
activity was simply assigned to the stack member variable. Since we
now rely on a callback from the activity record, we must check to
see if the record is null before invoking #setState on it.

Test: atest CtsAutoFillServiceTestCases:android.autofillservice.cts.SessionLifecycleTest#testDatasetVisibleWhileAutofilledAppIsLifecycled
Bug: 74604879
Change-Id: Icead81d44a826260145f72549a9caa0fb62d6af3
parent 5dbde05f

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

+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;