diff --git a/app/src/main/java/io/appium/uiautomator2/core/UiAutomatorBridge.java b/app/src/main/java/io/appium/uiautomator2/core/UiAutomatorBridge.java index 813495018..4ceee7fff 100644 --- a/app/src/main/java/io/appium/uiautomator2/core/UiAutomatorBridge.java +++ b/app/src/main/java/io/appium/uiautomator2/core/UiAutomatorBridge.java @@ -59,15 +59,12 @@ public UiAutomation getUiAutomation() { } public Display getDefaultDisplay() throws UiAutomator2Exception { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - // Device.getUiDevice gets the instance via 'androidx.test.platform.app.InstrumentationRegistry.getInstrumentation' - // context, thus here directly calls the method. - DisplayManager displayManager = (DisplayManager) getInstrumentation().getContext().getSystemService(Service.DISPLAY_SERVICE); - return displayManager.getDisplay(Display.DEFAULT_DISPLAY); - } + // 'getDefaultDisplay' will be removed from androidx.test.uiautomator.UiDevice in 2.3.0-beta01, + // thus here only relies on the getDisplay. - // "getDefaultDisplay" called inside the UiDevice calls - // https://developer.android.com/reference/android/view/WindowManager#getDefaultDisplay() - return (Display) invoke(getMethod(UiDevice.class, "getDefaultDisplay"), Device.getUiDevice()); + // Device.getUiDevice gets the instance via 'androidx.test.platform.app.InstrumentationRegistry.getInstrumentation' + // context, thus here directly calls the method. + DisplayManager displayManager = (DisplayManager) getInstrumentation().getContext().getSystemService(Service.DISPLAY_SERVICE); + return displayManager.getDisplay(Display.DEFAULT_DISPLAY); } }