commit 2e2bb0a7892bb393c403c8979fc4edab68e7bb49
author Yorke Lee <yorkelee@google.com> Sat Mar 12 00:13:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 12 00:13:50 2016 +0000
tree 319e4878ec25f5aafdd36bb464c9dfbfd24910b1
parent 9bb582c16fbb4f6b74bcc572d9e3d781e02b525e
parent 26903a34317a3137b49ed405e1388ec6f44f1f40

Merge "Fix for drag start event being incorrectly cached" into nyc-dev
am: 26903a3431

* commit '26903a34317a3137b49ed405e1388ec6f44f1f40':
  Fix for drag start event being incorrectly cached

core/java/android/view/ViewGroup.java

diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java
index d29bc21..56ee478 100644
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -1382,6 +1382,13 @@
             if (mIsInterestedInDrag) {
                 retval = true;
             }
+
+            if (!retval) {
+                // Neither us nor any of our children are interested in this drag, so stop tracking
+                // the current drag event.
+                mCurrentDragStartEvent.recycle();
+                mCurrentDragStartEvent = null;
+            }
         } break;
 
         case DragEvent.ACTION_DRAG_ENDED: {