Merge "Fixed cast exception with selectable text." into jb-dev

2012-06-07 14:15:40 -07:00
parent 0646411cbd 857c341dfe
commit 78c6aeeffa
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -4656,7 +4656,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
        // mInputType should already be EditorInfo.TYPE_NULL and mInput should be null

        setMovementMethod(selectable ? ArrowKeyMovementMethod.getInstance() : null);
-        setText(getText(), selectable ? BufferType.SPANNABLE : BufferType.NORMAL);
+        setText(mText, selectable ? BufferType.SPANNABLE : BufferType.NORMAL);

        // Called by setText above, but safer in case of future code changes
        mEditor.prepareCursorControllers();