Merge "Revert "Fix stage split rotation"" into sc-v2-dev (e175b6f5) · Commits · e / os / android_frameworks_base

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

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -780,12 +780,10 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
	}		}
	return SCREEN_ORIENTATION_UNSPECIFIED;		return SCREEN_ORIENTATION_UNSPECIFIED;
	} else {		} else {
	// Apps and their containers are not allowed to specify an orientation of non floating		// Apps and their containers are not allowed to specify an orientation of full screen
	// visible tasks created by organizer. The organizer handles the orientation instead.		// tasks created by organizer. The organizer handles the orientation instead.
	final Task nonFloatingTopTask =		final Task task = getTopRootTaskInWindowingMode(WINDOWING_MODE_FULLSCREEN);
	getRootTask(t -> !t.getWindowConfiguration().tasksAreFloating());		if (task != null && task.isVisible() && task.mCreatedByOrganizer) {
	if (nonFloatingTopTask != null && nonFloatingTopTask.mCreatedByOrganizer
	&& nonFloatingTopTask.isVisible()) {
	return SCREEN_ORIENTATION_UNSPECIFIED;		return SCREEN_ORIENTATION_UNSPECIFIED;
	}		}
	}		}