Merge "Moving away from obsolete Display#getRealSize()." into tm-dev

2022-03-30 17:44:44 +00:00
parent aa35c39167 c8aada4433
commit dc4dad8ec4
1 changed files with 8 additions and 2 deletions
@@ -877,10 +877,9 @@ public final class LauncherInstrumentation {
    }

    /**
+     * @return the Workspace object.
     * @deprecated use goHome().
     * Presses nav bar home button.
-     *
-     * @return the Workspace object.
     */
    @Deprecated
    public Workspace pressHome() {
@@ -1653,6 +1652,13 @@ public final class LauncherInstrumentation {
    Point getRealDisplaySize() {
        final Point size = new Point();
        getContext().getSystemService(WindowManager.class).getDefaultDisplay().getRealSize(size);
+        final Rect winMetricsHeight = getContext().getSystemService(WindowManager.class)
+                .getMaximumWindowMetrics()
+                .getBounds();
+        final Point winMetricsSize = new Point(winMetricsHeight.width(), winMetricsHeight.height());
+        if (!winMetricsSize.equals(size)) {
+            fail("Display size mismatch: " + size + " vs " + winMetricsSize);
+        }
        return size;
    }