Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acc62fda authored by Tony Huang's avatar Tony Huang
Browse files

Revert "Fix stage split rotation" 

This reverts commit 706bb3e9.

Reason for revert: Cause tests fail

Fix: 191338484
Change-Id: I7a5fb1fa31be2cb52c440dc64f91a83548bcc230
parent 706bb3e9

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;

            }

            }

        }

        }