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

Commit a33559ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Defer resume of activity while applying wct" into main

parents 965c1241 724a6ecd

services/core/java/com/android/server/wm/ActivityTaskSupervisor.java

+3 −0
Original line number Diff line number Diff line
@@ -2280,6 +2280,9 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
     * sent to the new top resumed activity.

     */

    ActivityRecord updateTopResumedActivityIfNeeded(String reason) {

        if (!readyToResume()) {

            return mTopResumedActivity;

        }

        final ActivityRecord prevTopActivity = mTopResumedActivity;

        final Task topRootTask = mRootWindowContainer.getTopDisplayFocusedRootTask();

        if (topRootTask == null || topRootTask.getTopResumedActivity() == prevTopActivity) {

services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java

+0 −2
Original line number Diff line number Diff line
@@ -382,13 +382,11 @@ public class ActivityTaskManagerServiceTests extends WindowTestsBase { 


    @Test

    public void testResumeNextActivityOnCrashedAppDied() {

        mSupervisor.beginDeferResume();

        final ActivityRecord homeActivity = new ActivityBuilder(mAtm)

                .setTask(mRootWindowContainer.getDefaultTaskDisplayArea().getOrCreateRootHomeTask())

                .build();

        final ActivityRecord activity = new ActivityBuilder(mAtm).setCreateTask(true).build();

        activity.setState(RESUMED, "test");

        mSupervisor.endDeferResume();



        assertEquals(activity.app, mAtm.mInternal.getTopApp());