Merge "Generalize window bounds for layout" into sc-v2-dev

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

@@ -1686,7 +1686,7 @@ public class DisplayPolicy {
             // frame set for the simulated layout for this case.
             computeWindowBounds(attrs, state, df, df);
         } else {
-            computeWindowBounds(attrs, state, win.mToken.getBounds(), df);
+            computeWindowBounds(attrs, state, win.getBounds(), df);
         }
         if (attached == null) {
             pf.set(df);

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

@@ -1443,16 +1443,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
         }
     }
 
-    // TODO: Look into whether this override is still necessary.
-    @Override
-    public Rect getBounds() {
-        if (mActivityRecord != null) {
-            return mActivityRecord.getBounds();
-        } else {
-            return super.getBounds();
-        }
-    }
-
     /** Retrieves the current frame of the window that the application sees. */
     Rect getFrame() {
         return mWindowFrames.mFrame;

services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java

@@ -590,7 +590,9 @@ public class DisplayContentTests extends WindowTestsBase {
         dc.setImeLayeringTarget(ws);
 
         // Adjust bounds so that matchesRootDisplayAreaBounds() returns false.
-        ws.mActivityRecord.getConfiguration().windowConfiguration.setBounds(new Rect(1, 1, 1, 1));
+        final Rect bounds = new Rect(dc.getBounds());
+        bounds.scale(0.5f);
+        ws.mActivityRecord.setBounds(bounds);
         assertFalse("matchesRootDisplayAreaBounds() should return false",
                 ws.matchesDisplayAreaBounds());