diff options
| author | Christopher Tate <ctate@google.com> | 2013-03-04 22:11:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-04 22:11:43 +0000 |
| commit | 8edd78499e2656916e89eeae91aa0f023f69eddc (patch) | |
| tree | 260fd75fbeedd0c9a58b5566bd3fc8b740779a63 /core/java | |
| parent | e7d32b19b46c65ff37001e456bedf68222599119 (diff) | |
| parent | 267097b00b073716ab2d02c3c068889d92ddb1a9 (diff) | |
Merge "DO NOT MERGE: Don't crash when we get a drag-ended after being detached" into jb-mr2-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 5105fda80225..df07f3cbc46d 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -1152,8 +1152,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } mDragNotifiedChildren.clear(); - mCurrentDrag.recycle(); - mCurrentDrag = null; + if (mCurrentDrag != null) { + mCurrentDrag.recycle(); + mCurrentDrag = null; + } } // We consider drag-ended to have been handled if one of our children |