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

1 files changed, 8 insertions, 2 deletions

diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index 8e0eb7b071..f270cd55e6 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -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;
     }