diff options
| author | Gilles Debunne <debunne@google.com> | 2012-02-24 17:04:10 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-24 17:04:10 -0800 |
| commit | 9f809c2fd186c7cdb5ed52af4240189298c80ef7 (patch) | |
| tree | d6278e2be4e958e59f93e0b2da8d16095376b0d3 /core/java/android/widget/TextView.java | |
| parent | b87148b2c05de1c601c539333c02547d0f10ebd9 (diff) | |
| parent | f14634e4917dc86a9dfd05cd0d76b530a2d4f392 (diff) | |
| download | frameworks_base-9f809c2fd186c7cdb5ed52af4240189298c80ef7.zip frameworks_base-9f809c2fd186c7cdb5ed52af4240189298c80ef7.tar.gz frameworks_base-9f809c2fd186c7cdb5ed52af4240189298c80ef7.tar.bz2 | |
Merge "Fix crash on long press in TextView"
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -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 1620929..e194bc2 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -8201,7 +8201,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener vibrate = false; } - if (!handled && (mEditor == null || getEditor().mSelectionActionMode != null)) { + if (!handled && mEditor != null && getEditor().mSelectionActionMode != null) { if (touchPositionIsInSelection()) { // Start a drag final int start = getSelectionStart(); |