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

Commit f4a51077 authored by Sergey Volnov's avatar Sergey Volnov Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix stage split rotation"" into sc-v2-dev am: e175b6f5 

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

Change-Id: Ib437340feadb5923c0ccc5748d14bfdac60a4e1d
parents d6d6710a e175b6f5

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;

            }

            }

        }

        }