diff options
| author | Doris Liu <tianliu@google.com> | 2015-05-28 22:51:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-28 22:51:42 +0000 |
| commit | a9ac835437f45c7f7f3fc53f56aec2d53390fa72 (patch) | |
| tree | 9dbf739a498124e08481956d19c67fb76e90696f /cmds | |
| parent | 626f0dc73bc1007d16688eddf29ea58ec26f424e (diff) | |
| parent | adb89214532a2eda2b5396886ae1ada16d890b24 (diff) | |
| download | frameworks_base-a9ac835437f45c7f7f3fc53f56aec2d53390fa72.zip frameworks_base-a9ac835437f45c7f7f3fc53f56aec2d53390fa72.tar.gz frameworks_base-a9ac835437f45c7f7f3fc53f56aec2d53390fa72.tar.bz2 | |
Merge "Clean up calls to Rect.intersect()" into mnc-dev
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(); + } } /** |