diff options
| author | Gilles Debunne <debunne@google.com> | 2012-06-07 14:22:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-07 14:22:39 -0700 |
| commit | 3eaf181f964590be06fa99af5d41ffb2d0a18654 (patch) | |
| tree | 946ad8a0d6a34a1197ce1c32c4a47a3119d96b9e /core/java/android/widget/TextView.java | |
| parent | 7ddb44b1934883ee83af9d5127133775a998328a (diff) | |
| parent | 11c15cfb4e48c53bcaf648c82de12707d6e479ba (diff) | |
am 11c15cfb: am 78c6aeef: Merge "Fixed cast exception with selectable text." into jb-dev
* commit '11c15cfb4e48c53bcaf648c82de12707d6e479ba':
Fixed cast exception with selectable text.
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 91dd29711cf7..25f01319ea54 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -4631,7 +4631,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(); |