diff options
author | Doris Liu <tianliu@google.com> | 2015-05-28 15:35:52 -0700 |
---|---|---|
committer | Doris Liu <tianliu@google.com> | 2015-05-28 15:39:05 -0700 |
commit | adb89214532a2eda2b5396886ae1ada16d890b24 (patch) | |
tree | 2289de40e3fecea23c1a12972bb067b29592bd2c /cmds | |
parent | 63428ccde7e925ceb94aa40e933b3d51954a7797 (diff) | |
download | frameworks_base-adb89214532a2eda2b5396886ae1ada16d890b24.zip frameworks_base-adb89214532a2eda2b5396886ae1ada16d890b24.tar.gz frameworks_base-adb89214532a2eda2b5396886ae1ada16d890b24.tar.bz2 |
Clean up calls to Rect.intersect()
This CL checks for the return value for Rect.intersect() for whether
there is actually an intersection before taking the return intersected
rect. In the case of no intersection (Rect.intersect() returns false),
an empty rect will be used as the intersection.
bug: 7368679
Change-Id: Ibda3bfd662f8ca83cb5662748d9be250243b72b2
Diffstat (limited to 'cmds')
-rw-r--r-- | cmds/uiautomator/library/core-src/com/android/uiautomator/core/AccessibilityNodeInfoHelper.java | 7 | ||||
-rw-r--r-- | cmds/uiautomator/library/core-src/com/android/uiautomator/core/UiObject.java | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/cmds/uiautomator/library/core-src/com/android/uiautomator/core/AccessibilityNodeInfoHelper.java b/cmds/uiautomator/library/core-src/com/android/uiautomator/core/AccessibilityNodeInfoHelper.java index 54835e3..de2fec0 100644 --- a/cmds/uiautomator/library/core-src/com/android/uiautomator/core/AccessibilityNodeInfoHelper.java +++ b/cmds/uiautomator/library/core-src/com/android/uiautomator/core/AccessibilityNodeInfoHelper.java @@ -46,7 +46,10 @@ class AccessibilityNodeInfoHelper { displayRect.right = width; displayRect.bottom = height; - nodeRect.intersect(displayRect); - return nodeRect; + if (nodeRect.intersect(displayRect)) { + return nodeRect; + } else { + return new Rect(); + } } } diff --git a/cmds/uiautomator/library/core-src/com/android/uiautomator/core/UiObject.java b/cmds/uiautomator/library/core-src/com/android/uiautomator/core/UiObject.java index 4bb99cd..2118da8 100644 --- a/cmds/uiautomator/library/core-src/com/android/uiautomator/core/UiObject.java +++ b/cmds/uiautomator/library/core-src/com/android/uiautomator/core/UiObject.java @@ -353,8 +353,12 @@ public class UiObject { Rect parentRect = AccessibilityNodeInfoHelper .getVisibleBoundsInScreen(scrollableParentNode, w, h); // adjust for partial clipping of targeted by parent node if required - nodeRect.intersect(parentRect); - return nodeRect; + if (nodeRect.intersect(parentRect)) { + return nodeRect; + } else { + // Node rect has no intersection with parent Rect + return new Rect(); + } } /** |