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

Commit 8ce640f9 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Always add the task to the recent task list when starting"

parents c4466894 f45dd9fc

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

+2 −2
Original line number Diff line number Diff line
@@ -1595,11 +1595,11 @@ class ActivityStarter { 
                mRootWindowContainer.resumeFocusedStacksTopActivities(

                        mTargetStack, mStartActivity, mOptions);

            }

        } else if (mStartActivity != null) {

            mSupervisor.mRecentTasks.add(mStartActivity.getTask());

        }

        mRootWindowContainer.updateUserStack(mStartActivity.mUserId, mTargetStack);



        // Update the recent tasks list immediately when the activity starts

        mSupervisor.mRecentTasks.add(mStartActivity.getTask());

        mSupervisor.handleNonResizableTaskIfNeeded(mStartActivity.getTask(),

                preferredWindowingMode, mPreferredDisplayId, mTargetStack);

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

+14 −0
Original line number Diff line number Diff line
@@ -1008,4 +1008,18 @@ public class ActivityStarterTests extends ActivityTestsBase { 
                .setOutActivity(outActivity).execute();

        assertThat(outActivity[0].inSplitScreenSecondaryWindowingMode()).isTrue();

    }



    @Test

    public void testActivityStart_expectAddedToRecentTask() {

        RecentTasks recentTasks = mock(RecentTasks.class);

        mService.mStackSupervisor.setRecentTasks(recentTasks);

        doReturn(true).when(recentTasks).isCallerRecents(anyInt());



        final ActivityStarter starter = prepareStarter(0 /* flags */);



        starter.setReason("testAddToTaskListOnActivityStart")

                .execute();



        verify(recentTasks, times(1)).add(any());

    }

}