diff options
| author | Gilles Debunne <debunne@google.com> | 2012-06-07 14:18:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-07 14:18:44 -0700 |
| commit | 11c15cfb4e48c53bcaf648c82de12707d6e479ba (patch) | |
| tree | d82875ad9b92713b254b677266f4185785f0fccf /core | |
| parent | 61168975d01a0f2589704fb690e1977a588129d0 (diff) | |
| parent | 78c6aeeffac7b665a0e1d822e88c92ef2b5ef353 (diff) | |
| download | frameworks_base-11c15cfb4e48c53bcaf648c82de12707d6e479ba.zip frameworks_base-11c15cfb4e48c53bcaf648c82de12707d6e479ba.tar.gz frameworks_base-11c15cfb4e48c53bcaf648c82de12707d6e479ba.tar.bz2 | |
am 78c6aeef: Merge "Fixed cast exception with selectable text." into jb-dev
* commit '78c6aeeffac7b665a0e1d822e88c92ef2b5ef353':
Fixed cast exception with selectable text.
Diffstat (limited to 'core')
| -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 131b075..01617da 100644 --- 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(); |