commit 8ee7285128c3843401d4c4d0412cd66e86ba49e3
author Andrii Kulian <akulian@google.com> Fri Mar 10 10:36:45 2017 -0800
committer Andrii Kulian <akulian@google.com> Fri Mar 10 18:34:18 2017 -0800
tree ea62692565464d21383179f5a1923e26c7effe28
parent 83c4712abdd89ca60c9916e72e755b2548e6b922

Move rotation tracking to DisplayContent

This CL moves rotation tracking from WindowManagerService to
DisplayContent. This way displays can be rotated independently and
rotation of the main display won't affect rotation of secondary
ones.

Bug: 34242678
Test: android.server.cts.ActivityManagerDisplayTests
Test: testRotationNotAffectingSecondaryScreen
Change-Id: Ic46aaa523482b31ff5ec77f0c2908ceda1156fc0

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

diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index 126e080..0222b3d 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -802,6 +802,7 @@
         mHoldScreenWindow = null;
         mObscuringWindow = null;
 
+        // TODO(multi-display): Support these features on secondary screens.
         if (mService.mWatermark != null) {
             mService.mWatermark.positionSurface(defaultDw, defaultDh);
         }
@@ -809,11 +810,12 @@
             mService.mStrictModeFlash.positionSurface(defaultDw, defaultDh);
         }
         if (mService.mCircularDisplayMask != null) {
-            mService.mCircularDisplayMask.positionSurface(defaultDw, defaultDh, mService.mRotation);
+            mService.mCircularDisplayMask.positionSurface(defaultDw, defaultDh,
+                    mService.getDefaultDisplayRotation());
         }
         if (mService.mEmulatorDisplayOverlay != null) {
             mService.mEmulatorDisplayOverlay.positionSurface(defaultDw, defaultDh,
-                    mService.mRotation);
+                    mService.getDefaultDisplayRotation());
         }
 
         boolean focusDisplayed = false;