Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use displayManager.getDisplay only for upcoming androidx.test.uiautomator:uiautomator:2.3.0-beta01 #588

Merged
merged 2 commits into from
Dec 30, 2023
Merged

fix: use displayManager.getDisplay only for upcoming androidx.test.uiautomator:uiautomator:2.3.0-beta01 #588

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d23ee21
fix: use displayManager.getDisplay only for upcoming androidx.test.ui…
KazuCocoa Dec 30, 2023
7aad5c0
Merge branch 'master' into fix-getdisplayinfo
KazuCocoa Dec 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions app/src/main/java/io/appium/uiautomator2/core/UiAutomatorBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Loading