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

Commit 6a2789e6 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix stage split rotation" into sc-v2-dev am: ab816e13 am: fd67cf88 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15389271

Change-Id: Ifa9b8b7781143f9bb6526b500219df01ec4b05f6
parents 0330d6ef fd67cf88

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

+6 −4
Original line number Diff line number Diff line
@@ -780,10 +780,12 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 
            }

            return SCREEN_ORIENTATION_UNSPECIFIED;

        } else {

            // 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) {

            // 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()) {

                return SCREEN_ORIENTATION_UNSPECIFIED;

            }

        }