Merge "Fix crash on long press in TextView"

Gilles Debunne · Android (Google) Code Review · commit 9f809c2fd186 · 2012-02-24T17:04:10.000-08:00
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
@@ -8201,7 +8201,7 @@ public boolean performLongClick() {
             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();

Original file line number	Diff line number	Diff line change
`@@ -8201,7 +8201,7 @@ public boolean performLongClick() {`
`8201`	`8201`	`vibrate = false;`
`8202`	`8202`	`}`
`8203`	`8203`
`8204`		`- if (!handled && (mEditor == null \|\| getEditor().mSelectionActionMode != null)) {`
	`8204`	`+ if (!handled && mEditor != null && getEditor().mSelectionActionMode != null) {`
`8205`	`8205`	`if (touchPositionIsInSelection()) {`
`8206`	`8206`	`// Start a drag`
`8207`	`8207`	`final int start = getSelectionStart();`