commit 26903a34317a3137b49ed405e1388ec6f44f1f40
author Yorke Lee <yorkelee@google.com> Sat Mar 12 00:04:47 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 12 00:04:48 2016 +0000
tree 914d4b93650d22e94ab868d68bbe269cb1dbaf44
parent 6c5dddfdcfd9211c26465c396d9338e09b74f791
parent 0394b2127f161ba55300f6e676424d892ec0df10

Merge "Fix for drag start event being incorrectly cached" into nyc-dev

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: {