Merge "Moving away from obsolete Display#getRealSize()." into tm-dev
diff --git a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
index f270cd5..84ef149 100644
--- a/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
+++ b/tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
@@ -1650,16 +1650,10 @@
}
Point getRealDisplaySize() {
- final Point size = new Point();
- getContext().getSystemService(WindowManager.class).getDefaultDisplay().getRealSize(size);
- final Rect winMetricsHeight = getContext().getSystemService(WindowManager.class)
+ final Rect displayBounds = 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;
+ return new Point(displayBounds.width(), displayBounds.height());
}
public void enableDebugTracing() {