From f14634e4917dc86a9dfd05cd0d76b530a2d4f392 Mon Sep 17 00:00:00 2001
From: Gilles Debunne <debunne@google.com>
Date: Fri, 24 Feb 2012 17:01:56 -0800
Subject: Fix crash on long press in TextView

Bug 6058792

Glitch in mEditor handling

Change-Id: I9b68796d5038c20d190ba5fbdaff1608b36aaee6
---
 core/java/android/widget/TextView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/java/android/widget/TextView.java')

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();
-- 
cgit v1.1