Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing crash in D&D due to race conditions during drag end."

Browse Source
This commit is contained in:
Vadim Tryshev
2016-01-06 02:55:06 +00:00
committed by Android (Google) Code Review
parent 7e6040d981 151778998a
commit 1ee3e370f9
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/view/ViewGroup.java
View File

@@ -1419,8 +1419,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
case DragEvent.ACTION_DRAG_ENDED: {
// Release the bookkeeping now that the drag lifecycle has ended
if (mChildrenInterestedInDrag != null) {
for (View child : mChildrenInterestedInDrag) {
final HashSet<View> childrenInterestedInDrag = mChildrenInterestedInDrag;
if (childrenInterestedInDrag != null) {
for (View child : childrenInterestedInDrag) {
// If a child was interested in the ongoing drag, it's told that it's over
if (child.dispatchDragEvent(event)) {
retval = true;
@@ -1428,12 +1429,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
child.mPrivateFlags2 &= ~View.DRAG_MASK;
child.refreshDrawableState();
}
mChildrenInterestedInDrag.clear();
if (mCurrentDragStartEvent != null) {
mCurrentDragStartEvent.recycle();
mCurrentDragStartEvent = null;
}
childrenInterestedInDrag.clear();
}
if (mCurrentDragStartEvent != null) {
mCurrentDragStartEvent.recycle();
mCurrentDragStartEvent = null;
}
if (mIsInterestedInDrag) {