Merge "Fix for NPE when dragging on TextView"

Author: Gilles Debunne

core/java/android/widget/TextView.java

@@ -8619,7 +8619,7 @@ private boolean isPositionOnText(float x, float y) {
     public boolean onDragEvent(DragEvent event) {
         switch (event.getAction()) {
             case DragEvent.ACTION_DRAG_STARTED:
-                return hasInsertionController();
+                return mEditor != null && hasInsertionController();
 
             case DragEvent.ACTION_DRAG_ENTERED:
                 TextView.this.requestFocus();