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

Commit 75a29805 authored by Naresh Kumar Podishetty (xWF)'s avatar Naresh Kumar Podishetty (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Defer resume of activity while applying wct" 

This reverts commit 724a6ecd.

Reason for revert: <Droid monitor creating the revert due to b/374224114 >

Change-Id: I31893b2a48e6bf93739e3503fd66b41985d77538
parent 724a6ecd

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

+0 −3
Original line number Diff line number Diff line
@@ -2280,9 +2280,6 @@ 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

+2 −0
Original line number Diff line number Diff line
@@ -382,11 +382,13 @@ 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());