From c8aada443303fa8fe6aa2bbf99efc2e2790e1824 Mon Sep 17 00:00:00 2001
From: vadimt <vadimt@google.com>
Date: Mon, 28 Mar 2022 12:57:38 -0700
Subject: [PATCH] Moving away from obsolete Display#getRealSize().

Step 1: use both new and old APIs and make sure they return the same values.

Bug: 202567877, 227307209
Test: presubmit
Change-Id: I86fbb0ca089a88b5ff787a5c353664a192fb7e79
---
 .../launcher3/tapl/LauncherInstrumentation.java        | 10 ++++++++--
 1 file 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;
     }