diff options
| author | Gilles Debunne <debunne@google.com> | 2012-02-27 15:26:16 -0800 |
|---|---|---|
| committer | Gilles Debunne <debunne@google.com> | 2012-02-27 15:26:17 -0800 |
| commit | e7769bc76d01e9b031f65a58129b3e358ebabd3f (patch) | |
| tree | a11a218b80579dae585009703dbfe822422fc875 /core/java/android | |
| parent | 35ae6e2a841d8a287bccb56881f58e9fe24a07b6 (diff) | |
| download | frameworks_base-e7769bc76d01e9b031f65a58129b3e358ebabd3f.zip frameworks_base-e7769bc76d01e9b031f65a58129b3e358ebabd3f.tar.gz frameworks_base-e7769bc76d01e9b031f65a58129b3e358ebabd3f.tar.bz2 | |
Fix for NPE when dragging on TextView
Bug 6076166
Change-Id: I52b1e2edc451f0601b71af50e6056dcbe69add43
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/TextView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index d6dd15e..15d0f54 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -8619,7 +8619,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener public boolean onDragEvent(DragEvent event) { switch (event.getAction()) { case DragEvent.ACTION_DRAG_STARTED: - return hasInsertionController(); + return mEditor != null && hasInsertionController(); case DragEvent.ACTION_DRAG_ENTERED: TextView.this.requestFocus(); |