From e7769bc76d01e9b031f65a58129b3e358ebabd3f Mon Sep 17 00:00:00 2001
From: Gilles Debunne <debunne@google.com>
Date: Mon, 27 Feb 2012 15:26:16 -0800
Subject: Fix for NPE when dragging on TextView

Bug 6076166

Change-Id: I52b1e2edc451f0601b71af50e6056dcbe69add43
---
 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 d6dd15e..15d0f54 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8619,7 +8619,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
     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();
-- 
cgit v1.1