Merge "Fix for NPE on long press to start a selection on text."
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 15d0f54..b126625 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8222,7 +8222,7 @@
         }
 
         // Start a new selection
-        if (!handled) {
+        if (!handled && mEditor != null) {
             vibrate = handled = startSelectionActionMode();
         }