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

2016-03-12 00:04:47 +00:00
parent 6c5dddfdcf 0394b2127f
commit 26903a3431
1 changed files with 7 additions and 0 deletions
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -1382,6 +1382,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
            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: {