commit c9affff74c00749778b9932f0e0905875f86a681
author Roozbeh Pournader <roozbeh@google.com> Thu May 18 19:32:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 18 19:32:02 2017 +0000
tree 9f500f87fcf3c925da2dc31b33d6420bb9bd4b00
parent 1c8334078df0286b880a89d13e5a661e3426ed04
parent 99e620ef32b7d84ca09d1e7d704368cd5202fee2

Merge "In onDragEvent(), don't assume text is Spannable" into oc-dev
am: 99e620ef32

Change-Id: I5431864f75241c9f8b33064981ea332e7bef823b

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 77f27d9..8542bec0 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -11227,8 +11227,10 @@
                 return true;
 
             case DragEvent.ACTION_DRAG_LOCATION:
-                final int offset = getOffsetForPosition(event.getX(), event.getY());
-                Selection.setSelection((Spannable) mText, offset);
+                if (mText instanceof Spannable) {
+                    final int offset = getOffsetForPosition(event.getX(), event.getY());
+                    Selection.setSelection((Spannable) mText, offset);
+                }
                 return true;
 
             case DragEvent.ACTION_DROP: