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

Commit b367fee2 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Use top state for ResumeActivityItem" into main

parents 8a83ce2b 32d7a2fb
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -1535,10 +1535,11 @@ class TaskFragment extends WindowContainer<WindowContainer> {
                        next.getTask().mTaskId, next.shortComponentName);

                mAtmService.getAppWarningsLocked().onResumeActivity(next);
                next.app.setPendingUiCleanAndForceProcessStateUpTo(mAtmService.mTopProcessState);
                final int topProcessState = mAtmService.mTopProcessState;
                next.app.setPendingUiCleanAndForceProcessStateUpTo(topProcessState);
                next.abortAndClearOptionsAnimation();
                transaction.setLifecycleStateRequest(
                        ResumeActivityItem.obtain(next.token, next.app.getReportedProcState(),
                        ResumeActivityItem.obtain(next.token, topProcessState,
                                dc.isNextTransitionForward(), next.shouldSendCompatFakeFocus()));
                mAtmService.getLifecycleManager().scheduleTransaction(transaction);