From acc62fda0aeae0d51a4db4ef0e992c98bf1b58e2 Mon Sep 17 00:00:00 2001 From: Tony Huang Date: Fri, 23 Jul 2021 11:36:40 +0000 Subject: [PATCH] Revert "Fix stage split rotation" This reverts commit 706bb3e9a3db65ff711e902879b44b86a2d421e9. Reason for revert: Cause tests fail Fix: 191338484 Change-Id: I7a5fb1fa31be2cb52c440dc64f91a83548bcc230 --- .../java/com/android/server/wm/TaskDisplayArea.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java index 6c8cde433481f..10c16ff96a164 100644 --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java @@ -780,12 +780,10 @@ final class TaskDisplayArea extends DisplayArea { } return SCREEN_ORIENTATION_UNSPECIFIED; } else { - // 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. - final Task nonFloatingTopTask = - getRootTask(t -> !t.getWindowConfiguration().tasksAreFloating()); - if (nonFloatingTopTask != null && nonFloatingTopTask.mCreatedByOrganizer - && nonFloatingTopTask.isVisible()) { + // Apps and their containers are not allowed to specify an orientation of full screen + // tasks created by organizer. The organizer handles the orientation instead. + final Task task = getTopRootTaskInWindowingMode(WINDOWING_MODE_FULLSCREEN); + if (task != null && task.isVisible() && task.mCreatedByOrganizer) { return SCREEN_ORIENTATION_UNSPECIFIED; } }