Merge "Add getAdjacentTaskFragment check for the split screen case" into tm-dev (d60f5664) · Commits · e / os / android_frameworks_base

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -654,13 +654,15 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
		}

		// Apps and their containers are not allowed to specify an orientation of non floating
		// visible tasks created by organizer. The organizer handles the orientation instead.
		// visible tasks created by organizer and that has an adjacent task.
		final Task nonFloatingTopTask =
		getRootTask(t -> !t.getWindowConfiguration().tasksAreFloating());
		if (nonFloatingTopTask != null && nonFloatingTopTask.mCreatedByOrganizer
		&& nonFloatingTopTask.isVisible()) {
		getTask(t -> !t.getWindowConfiguration().tasksAreFloating());
		if (nonFloatingTopTask != null) {
		final Task task = nonFloatingTopTask.getCreatedByOrganizerTask();
		if (task != null && task.getAdjacentTaskFragment() != null && task.isVisible()) {
		return SCREEN_ORIENTATION_UNSPECIFIED;
		}
		}

		final int orientation = super.getOrientation(candidate);
		if (orientation != SCREEN_ORIENTATION_UNSET