Merge "Update stack bounds for fullscreen if rotated after updateDisplayInfo" into nyc-dev

am: 918084e9ae

* commit '918084e9ae9620c745e4d6212f6648771051e706':
  Update stack bounds for fullscreen if rotated after updateDisplayInfo

Change-Id: Id30d9ac8fc7c21c8ca65afb7c2bbb8fca1255d1b

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

@@ -383,12 +383,6 @@ public class TaskStack implements DimLayer.DimLayerUser,
     }
 
     private boolean updateBoundsAfterConfigChange() {
-        if (mFullscreen) {
-            // Bounds will already be set correctly when display info is updated in the case of
-            // fullscreen.
-            return false;
-        }
-
         final int newRotation = getDisplayInfo().rotation;
         final int newDensity = getDisplayInfo().logicalDensityDpi;
 
@@ -397,6 +391,13 @@ public class TaskStack implements DimLayer.DimLayerUser,
             return false;
         }
 
+        if (mFullscreen) {
+            // Update stack bounds again since rotation changed since updateDisplayInfo().
+            setBounds(null);
+            // Return false since we don't need the client to resize.
+            return false;
+        }
+
         final int oldDockSide = mStackId == DOCKED_STACK_ID ? getDockSide() : DOCKED_INVALID;
         mTmpRect2.set(mBounds);
         mDisplayContent.rotateBounds(mRotation, newRotation, mTmpRect2);