Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8edd7849 authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Don't crash when we get a drag-ended after being detached" into jb-mr2-dev

parents e7d32b19 267097b0

core/java/android/view/ViewGroup.java

+4 −2
Original line number Diff line number Diff line
@@ -1152,9 +1152,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
                }



                mDragNotifiedChildren.clear();

                if (mCurrentDrag != null) {

                    mCurrentDrag.recycle();

                    mCurrentDrag = null;

                }

            }



            // We consider drag-ended to have been handled if one of our children

            // had offered to handle the drag.