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: Possible race condition NPE #535

Merged
merged 1 commit into from
Sep 22, 2023
+4 −2
Merged

fix: Possible race condition NPE #535

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions app/src/main/java/io/appium/uiautomator2/core/AxNodeInfoHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import android.util.Pair;
import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
import android.view.accessibility.AccessibilityWindowInfo;

import androidx.annotation.Nullable;
import androidx.test.uiautomator.Direction;
Expand Down Expand Up @@ -252,8 +253,9 @@ private static Rect getBounds(@Nullable AccessibilityNodeInfo node, Rect display

// Trim any portion of the bounds that are outside the window
Rect window = new Rect();
if (node.getWindow() != null) {
node.getWindow().getBoundsInScreen(window);
AccessibilityWindowInfo nodeWindow = node.getWindow();
if (nodeWindow != null) {
nodeWindow.getBoundsInScreen(window);
ret.intersect(window);
}

Expand Down
Loading