summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2012-02-24 17:01:56 -0800
committerGilles Debunne <debunne@google.com>2012-02-24 17:01:59 -0800
commitf14634e4917dc86a9dfd05cd0d76b530a2d4f392 (patch)
tree094ecbe2767da96a30136399328067ad36f3affc /core/java
parenta16c98c155a51a035719bef5b76e973ee2295795 (diff)
downloadframeworks_base-f14634e4917dc86a9dfd05cd0d76b530a2d4f392.zip
frameworks_base-f14634e4917dc86a9dfd05cd0d76b530a2d4f392.tar.gz
frameworks_base-f14634e4917dc86a9dfd05cd0d76b530a2d4f392.tar.bz2
Fix crash on long press in TextView
Bug 6058792 Glitch in mEditor handling Change-Id: I9b68796d5038c20d190ba5fbdaff1608b36aaee6
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/widget/TextView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index a4087d5..fcd08bb 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();