am e608644a: am 7486bc1f: Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev

* commit 'e608644a9f0fa54a05379c171814569816145801':
  Fix an edge case in computing click location in accessibility mode.

1 files changed, 6 insertions, 0 deletions

diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index 5b06c5c..10af0c3 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -825,6 +825,12 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
             return false;
         }
 
+        // Clip the bounds by our bounds.
+        bounds.left = Math.max(bounds.left, 0);
+        bounds.top = Math.max(bounds.top, 0);
+        bounds.right = Math.min(bounds.right, mRight);
+        bounds.bottom = Math.min(bounds.bottom, mBottom);
+
         Iterator<View> iterator = obtainOrderedChildIterator();
         while (iterator.hasNext()) {
             View sibling = iterator.next();