From 0f6a6c4bc15fee726ef9aeb0d99b1204767f431d Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Thu, 12 May 2016 14:47:27 -0700
Subject: [PATCH] Don't allow any app to specify rotation unless in home task

The previous logic was racy/buggy in a sense so that the non-home app
could still force the orientation when the divider was still minimized.
The logic is cleaned up so only the home task can force the orientation
in multi-window.

Change-Id: I9eccf86d9fa442375d6eca400cb6ac0815c9fa10
Fixes: 28675152
---
 .../server/wm/WindowManagerService.java       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 8fa9efbda1827..09428b1daad34 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -3540,14 +3540,6 @@ public class WindowManagerService extends IWindowManager.Stub
             }
         }
 
-        if ((isStackVisibleLocked(DOCKED_STACK_ID)
-                && !mStackIdToStack.get(DOCKED_STACK_ID).isAdjustedForMinimizedDock())
-                || isStackVisibleLocked(FREEFORM_WORKSPACE_STACK_ID)) {
-            // We don't let app affect the system orientation when in freeform or docked mode since
-            // they don't occupy the entire display and their request can conflict with other apps.
-            return SCREEN_ORIENTATION_UNSPECIFIED;
-        }
-
         // Top system windows are not requesting an orientation. Start searching from apps.
         return getAppSpecifiedOrientation();
     }
@@ -3556,9 +3548,10 @@ public class WindowManagerService extends IWindowManager.Stub
         int lastOrientation = SCREEN_ORIENTATION_UNSPECIFIED;
         boolean findingBehind = false;
         boolean lastFullscreen = false;
-        // TODO: Multi window.
         DisplayContent displayContent = getDefaultDisplayContentLocked();
         final ArrayList<Task> tasks = displayContent.getTasks();
+        final boolean inMultiWindow = isStackVisibleLocked(DOCKED_STACK_ID)
+                || isStackVisibleLocked(FREEFORM_WORKSPACE_STACK_ID);
         for (int taskNdx = tasks.size() - 1; taskNdx >= 0; --taskNdx) {
             AppTokenList tokens = tasks.get(taskNdx).mAppTokens;
             final int firstToken = tokens.size() - 1;
@@ -3593,6 +3586,11 @@ public class WindowManagerService extends IWindowManager.Stub
                     continue;
                 }
 
+                // No app except the home app may specify the screen orientation in multi-window.
+                if (inMultiWindow && !atoken.mTask.isHomeTask()) {
+                    continue;
+                }
+
                 if (tokenNdx == 0) {
                     // Last token in this task.
                     lastOrientation = atoken.requestedOrientation;
@@ -3620,8 +3618,10 @@ public class WindowManagerService extends IWindowManager.Stub
         if (DEBUG_ORIENTATION) Slog.v(TAG_WM,
                 "No app is requesting an orientation, return " + mForcedAppOrientation);
         // The next app has not been requested to be visible, so we keep the current orientation
-        // to prevent freezing/unfreezing the display too early.
-        return mForcedAppOrientation;
+        // to prevent freezing/unfreezing the display too early unless we are in multi-window, in
+        // which we don't let the app customize the orientation unless it was the home task that
+        // is handled above.
+        return inMultiWindow ? SCREEN_ORIENTATION_UNSPECIFIED : mForcedAppOrientation;
     }
 
     @Override