Merge "Only call -rerouted callback if displayId changed" (f554792c) · Commits · e / os / android_frameworks_base

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -2430,17 +2430,17 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
		final boolean singleTaskInstance = preferredDisplay != null
		&& preferredDisplay.isSingleTaskInstance();

		if (singleTaskInstance) {
		if (preferredDisplayId != actualDisplayId) {
		// Suppress the warning toast if the preferredDisplay was set to singleTask.
		// The singleTaskInstance displays will only contain one task and any attempt to
		// launch new task will re-route to the default display.
		if (singleTaskInstance) {
		mService.getTaskChangeNotificationController()
		.notifyActivityLaunchOnSecondaryDisplayRerouted(task.getTaskInfo(),
		preferredDisplayId);
		return;
		}

		if (preferredDisplayId != actualDisplayId) {
		Slog.w(TAG, "Failed to put " + task + " on display " + preferredDisplayId);
		// Display a warning toast that we failed to put a task on a secondary display.
		mService.getTaskChangeNotificationController()