Merge "Fix 2-level task to 1-level task (1/2)" (8790d325) · Commits · e / os / android_frameworks_base

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

+558 −451

File changed.

Preview size limit exceeded, changes collapsed.

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

+100 −101

File changed.

Preview size limit exceeded, changes collapsed.

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

+4 −14

Original line number	Original line	Diff line number	Diff line
	@@ -19,8 +19,6 @@ package com.android.server.wm;
	import static android.app.ActivityManager.START_DELIVERED_TO_TOP;		import static android.app.ActivityManager.START_DELIVERED_TO_TOP;
	import static android.app.ActivityManager.START_TASK_TO_FRONT;		import static android.app.ActivityManager.START_TASK_TO_FRONT;
	import static android.app.ITaskStackListener.FORCED_RESIZEABLE_REASON_SECONDARY_DISPLAY;		import static android.app.ITaskStackListener.FORCED_RESIZEABLE_REASON_SECONDARY_DISPLAY;
	import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
	import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

	import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;		import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
	import static com.android.dx.mockito.inline.extended.ExtendedMockito.never;		import static com.android.dx.mockito.inline.extended.ExtendedMockito.never;
	@@ -44,7 +42,6 @@ import android.view.Display;

	import androidx.test.filters.MediumTest;		import androidx.test.filters.MediumTest;

	import org.junit.Before;
	import org.junit.Test;		import org.junit.Test;
	import org.junit.runner.RunWith;		import org.junit.runner.RunWith;

	@@ -58,13 +55,6 @@ import org.junit.runner.RunWith;
	@Presubmit		@Presubmit
	@RunWith(WindowTestRunner.class)		@RunWith(WindowTestRunner.class)
	public class ActivityTaskSupervisorTests extends WindowTestsBase {		public class ActivityTaskSupervisorTests extends WindowTestsBase {
	private Task mFullscreenTask;

	@Before
	public void setUp() throws Exception {
	mFullscreenTask = mRootWindowContainer.getDefaultTaskDisplayArea().createStack(
	WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */);
	}

	/**		/**
	* Ensures that an activity is removed from the stopping activities list once it is resumed.		* Ensures that an activity is removed from the stopping activities list once it is resumed.
	@@ -72,7 +62,7 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase {
	@Test		@Test
	public void testStoppingActivityRemovedWhenResumed() {		public void testStoppingActivityRemovedWhenResumed() {
	final ActivityRecord firstActivity = new ActivityBuilder(mAtm)		final ActivityRecord firstActivity = new ActivityBuilder(mAtm)
	.setTask(mFullscreenTask).build();		.setCreateTask(true).build();
	mSupervisor.mStoppingActivities.add(firstActivity);		mSupervisor.mStoppingActivities.add(firstActivity);

	firstActivity.completeResumeLocked();		firstActivity.completeResumeLocked();
	@@ -86,7 +76,7 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase {
	@Test		@Test
	public void testReportWaitingActivityLaunchedIfNeeded() {		public void testReportWaitingActivityLaunchedIfNeeded() {
	final ActivityRecord firstActivity = new ActivityBuilder(mAtm)		final ActivityRecord firstActivity = new ActivityBuilder(mAtm)
	.setTask(mFullscreenTask).build();		.setCreateTask(true).build();

	final WaitResult taskToFrontWait = new WaitResult();		final WaitResult taskToFrontWait = new WaitResult();
	mSupervisor.mWaitingActivityLaunched.add(taskToFrontWait);		mSupervisor.mWaitingActivityLaunched.add(taskToFrontWait);
	@@ -153,7 +143,7 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase {
	@Test		@Test
	public void testNotifyTaskFocusChanged() {		public void testNotifyTaskFocusChanged() {
	final ActivityRecord fullScreenActivityA = new ActivityBuilder(mAtm).setCreateTask(true)		final ActivityRecord fullScreenActivityA = new ActivityBuilder(mAtm).setCreateTask(true)
	.setParentTask(mFullscreenTask).build();		.build();
	final Task taskA = fullScreenActivityA.getTask();		final Task taskA = fullScreenActivityA.getTask();

	final TaskChangeNotificationController taskChangeNotifier =		final TaskChangeNotificationController taskChangeNotifier =
	@@ -166,7 +156,7 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase {
	reset(taskChangeNotifier);		reset(taskChangeNotifier);

	final ActivityRecord fullScreenActivityB = new ActivityBuilder(mAtm).setCreateTask(true)		final ActivityRecord fullScreenActivityB = new ActivityBuilder(mAtm).setCreateTask(true)
	.setParentTask(mFullscreenTask).build();		.build();
	final Task taskB = fullScreenActivityB.getTask();		final Task taskB = fullScreenActivityB.getTask();

	mAtm.setResumedActivityUncheckLocked(fullScreenActivityB, "resumeB");		mAtm.setResumedActivityUncheckLocked(fullScreenActivityB, "resumeB");

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

+1 −3

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

+147 −147

File changed.

Preview size limit exceeded, changes collapsed.

Original line number	Original line	Diff line number	Diff line
	@@ -53,14 +53,12 @@ import org.junit.runner.RunWith;
	@RunWith(WindowTestRunner.class)		@RunWith(WindowTestRunner.class)
	public class AppChangeTransitionTests extends WindowTestsBase {		public class AppChangeTransitionTests extends WindowTestsBase {

	private Task mStack;
	private Task mTask;		private Task mTask;
	private ActivityRecord mActivity;		private ActivityRecord mActivity;

	public void setUpOnDisplay(DisplayContent dc) {		public void setUpOnDisplay(DisplayContent dc) {
	mActivity = createActivityRecord(dc, WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD);		mActivity = createActivityRecord(dc, WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD);
	mTask = mActivity.getTask();		mTask = mActivity.getTask();
	mStack = mTask.getRootTask();

	// Set a remote animator with snapshot disabled. Snapshots don't work in wmtests.		// Set a remote animator with snapshot disabled. Snapshots don't work in wmtests.
	RemoteAnimationDefinition definition = new RemoteAnimationDefinition();		RemoteAnimationDefinition definition = new RemoteAnimationDefinition();
	@@ -143,7 +141,7 @@ public class AppChangeTransitionTests extends WindowTestsBase {
	// Reparenting to a display with different windowing mode may trigger		// Reparenting to a display with different windowing mode may trigger
	// a change transition internally, but it should be cleaned-up once		// a change transition internally, but it should be cleaned-up once
	// the display change is complete.		// the display change is complete.
	mStack.reparent(mDisplayContent.getDefaultTaskDisplayArea(), true);		mTask.reparent(mDisplayContent.getDefaultTaskDisplayArea(), true);

	assertEquals(WINDOWING_MODE_FULLSCREEN, mTask.getWindowingMode());		assertEquals(WINDOWING_MODE_FULLSCREEN, mTask.getWindowingMode());