am f64d26fc: am e130d6c1: Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev
automerge: 19ecc78

* commit '19ecc7847faf0f6800c342eab806358d68b610c1':
  Remove a bad heuristic when determining click location for accessibility.
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 143aa24..96c218f 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -5942,8 +5942,7 @@
      * @hide
      */
     public void addClickableRectsForAccessibility(List<RectF> outRects) {
-        if (isClickable() || isLongClickable()
-                || (mListenerInfo != null && mListenerInfo.mOnTouchListener != null)) {
+        if (isClickable() || isLongClickable()) {
             RectF bounds = new RectF();
             bounds.set(0, 0, getWidth(), getHeight());
             outRects.add(bounds);