Merge "Fix some issues found in AM display tests" (adca073b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+17 −15

Original line number	Diff line number	Diff line
		@@ -2312,7 +2312,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		if (displayId == INVALID_DISPLAY) {
		displayId = candidateDisplayId;
		}
		if (displayId != INVALID_DISPLAY) {
		if (displayId != INVALID_DISPLAY && canLaunchOnDisplay(r, displayId)) {
		if (r != null) {
		// TODO: This should also take in the windowing mode and activity type into account.
		stack = (T) getValidLaunchStackOnDisplay(displayId, r);
		@@ -2341,7 +2341,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		}
		if (stack != null) {
		display = stack.getDisplay();
		if (display != null) {
		if (display != null && canLaunchOnDisplay(r, display.mDisplayId)) {
		final int windowingMode =
		display.resolveWindowingMode(r, options, candidateTask, activityType);
		if (stack.isCompatible(windowingMode, activityType)) {
		@@ -2351,6 +2351,7 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		}

		if (display == null
		\|\| !canLaunchOnDisplay(r, display.mDisplayId)
		// TODO: Can be removed once we figure-out how non-standard types should launch
		// outside the default display.
		\|\| (activityType != ACTIVITY_TYPE_STANDARD
		@@ -2361,6 +2362,14 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		return display.getOrCreateStack(r, options, candidateTask, activityType, onTop);
		}

		/** @return true if activity record is null or can be launched on provided display. */
		private boolean canLaunchOnDisplay(ActivityRecord r, int displayId) {
		if (r == null) {
		return true;
		}
		return r.canBeLaunchedOnDisplay(displayId);
		}

		/**
		* Get a topmost stack on the display, that is a valid launch stack for specified activity.
		* If there is no such stack, new dynamic stack can be created.
		@@ -4248,22 +4257,15 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D

		// Handle incorrect launch/move to secondary display if needed.
		if (isSecondaryDisplayPreferred) {
		final boolean launchOnSecondaryDisplayFailed;
		final int actualDisplayId = task.getStack().mDisplayId;
		if (!task.canBeLaunchedOnDisplay(actualDisplayId)) {
		// The task landed on an inappropriate display somehow, move it to the default
		// display.
		throw new IllegalStateException("Task resolved to incompatible display");
		}
		// The task might have landed on a display different from requested.
		// TODO(multi-display): Find proper stack for the task on the default display.
		mService.setTaskWindowingMode(task.taskId,
		WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY, true /* toTop */);
		launchOnSecondaryDisplayFailed = true;
		} else {
		// The task might have landed on a display different from requested.
		launchOnSecondaryDisplayFailed = actualDisplayId == DEFAULT_DISPLAY
		\|\| (preferredDisplayId != INVALID_DISPLAY
		&& preferredDisplayId != actualDisplayId);
		}
		if (launchOnSecondaryDisplayFailed) {
		if (preferredDisplayId != actualDisplayId) {
		// Display a warning toast that we tried to put a non-resizeable task on a secondary
		// display with config different from global config.
		mService.mTaskChangeNotificationController

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -1812,6 +1812,9 @@ class ActivityStarter {
		}
		}
		}
		// Need to update mTargetStack because if task was moved out of it, the original stack may
		// be destroyed.
		mTargetStack = intentActivity.getStack();
		if (!mMovedToFront && mDoResume) {
		if (DEBUG_TASKS) Slog.d(TAG_TASKS, "Bring to front target: " + mTargetStack
		+ " from " + intentActivity);

services/core/java/com/android/server/am/TaskRecord.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -623,6 +623,9 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi
		if (toStack == sourceStack) {
		return false;
		}
		if (!canBeLaunchedOnDisplay(toStack.mDisplayId)) {
		return false;
		}

		final int toStackWindowingMode = toStack.getWindowingMode();
		final ActivityRecord topActivity = getTopActivity();

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -4561,6 +4561,7 @@ public class WindowManagerService extends IWindowManager.Stub
		if (displayContent != null) {
		mAnimator.addDisplayLocked(displayId);
		displayContent.initializeDisplayBaseInfo();
		reconfigureDisplayLocked(displayContent);
		}
		}
		}
		@@ -6700,7 +6701,6 @@ public class WindowManagerService extends IWindowManager.Stub
		synchronized (mWindowMap) {
		final Display display = mDisplayManager.getDisplay(displayId);
		if (display != null) {
		createDisplayContentLocked(display);
		displayReady(displayId);
		}
		mWindowPlacerLocked.requestTraversal();