commit 5aca9cbba1ee6710b2795025244938cbc0fba8a4
author Yorke Lee <yorkelee@google.com> Sat Mar 12 00:19:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 12 00:19:43 2016 +0000
tree 495c747ee4789284d3a0efd4e33ec97055c5774c
parent 118f3b5b92db3a0b683f216456b723054f94a817
parent 2e2bb0a7892bb393c403c8979fc4edab68e7bb49

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

* commit '2e2bb0a7892bb393c403c8979fc4edab68e7bb49':
  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: {