feat: get default display via displaymanager

appium · Dec 27, 2023 · 4b9164f · 4b9164f
1 parent 1a1d473
commit 4b9164f
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/app/src/main/java/io/appium/uiautomator2/core/UiAutomatorBridge.java b/app/src/main/java/io/appium/uiautomator2/core/UiAutomatorBridge.java
@@ -15,7 +15,11 @@
  */
 package io.appium.uiautomator2.core;
 
+import android.app.Instrumentation;
+import android.app.Service;
 import android.app.UiAutomation;
+import android.hardware.display.DisplayManager;
+import android.os.Build;
 import android.view.Display;
 import android.view.accessibility.AccessibilityNodeInfo;
 
@@ -54,6 +58,14 @@ public UiAutomation getUiAutomation() {
     }
 
     public Display getDefaultDisplay() throws UiAutomator2Exception {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            Instrumentation instrumentation = (Instrumentation) invoke(getMethod(UiDevice.class, "getInstrumentation"), Device.getUiDevice());
+            DisplayManager displayManager = (DisplayManager) instrumentation.getContext().getSystemService(Service.DISPLAY_SERVICE);
+            return displayManager.getDisplay(Display.DEFAULT_DISPLAY);
+        }
+
+        // "getDefaultDisplay" called inside the UiDevice calls
+        // https://developer.android.com/reference/android/view/WindowManager#getDefaultDisplay()
         return (Display) invoke(getMethod(UiDevice.class, "getDefaultDisplay"), Device.getUiDevice());
     }
 }