Merge "Modify multi-display Activity launching behavior" into sc-dev (632e4351) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -406,6 +406,12 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier {
		}
		}

		if (taskDisplayArea == null && source != null) {
		final TaskDisplayArea sourceDisplayArea = source.getDisplayArea();
		if (DEBUG) appendLog("display-area-from-source=" + sourceDisplayArea);
		taskDisplayArea = sourceDisplayArea;
		}

		Task rootTask = (taskDisplayArea == null && task != null)
		? task.getRootTask() : null;
		if (rootTask != null) {
		@@ -413,12 +419,6 @@ class TaskLaunchParamsModifier implements LaunchParamsModifier {
		taskDisplayArea = rootTask.getDisplayArea();
		}

		if (taskDisplayArea == null && source != null) {
		final TaskDisplayArea sourceDisplayArea = source.getDisplayArea();
		if (DEBUG) appendLog("display-area-from-source=" + sourceDisplayArea);
		taskDisplayArea = sourceDisplayArea;
		}

		if (taskDisplayArea == null && options != null) {
		final int callerDisplayId = options.getCallerDisplayId();
		final DisplayContent dc =

+2 −2

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ public class TaskLaunchParamsModifierTests extends WindowTestsBase {
		}

		@Test
		public void testUsesTasksDisplayAreaIdPriorToSourceIfSet() {
		public void testUsesSourcesDisplayAreaIdPriorToTaskIfSet() {
		final TestDisplayContent freeformDisplay = createNewDisplayContent(
		WINDOWING_MODE_FREEFORM);
		final TestDisplayContent fullscreenDisplay = createNewDisplayContent(
		@@ -211,7 +211,7 @@ public class TaskLaunchParamsModifierTests extends WindowTestsBase {
		.setSource(source)
		.calculate());

		assertEquals(fullscreenDisplay.getDefaultTaskDisplayArea(),
		assertEquals(freeformDisplay.getDefaultTaskDisplayArea(),
		mResult.mPreferredTaskDisplayArea);
		}