diff options
| author | Gilles Debunne <debunne@google.com> | 2012-02-24 17:42:03 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-24 17:42:03 -0800 |
| commit | 5cd164c5cf58047cda39b05a2c4f3cbab2d10078 (patch) | |
| tree | 75d5c52b972e0bbf633e20a31bb8f737724d953f /core/java/android/widget/TextView.java | |
| parent | 93d083b6ad4e54032f4525125d750926e2433f87 (diff) | |
| parent | c1e79b45a2fa49cd31eed7437942ba9796495164 (diff) | |
| download | frameworks_base-5cd164c5cf58047cda39b05a2c4f3cbab2d10078.zip frameworks_base-5cd164c5cf58047cda39b05a2c4f3cbab2d10078.tar.gz frameworks_base-5cd164c5cf58047cda39b05a2c4f3cbab2d10078.tar.bz2 | |
Merge "Fix NPE on Activity start in TextView"
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index e194bc2..d6dd15e 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -2980,8 +2980,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener "/" + ss.selEnd + " out of range for " + restored + "text " + mText); } else { - Selection.setSelection((Spannable) mText, ss.selStart, - ss.selEnd); + Selection.setSelection((Spannable) mText, ss.selStart, ss.selEnd); if (ss.frozenWithFocus) { createEditorIfNeeded("restore instance with focus"); @@ -6983,6 +6982,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener */ protected void onSelectionChanged(int selStart, int selEnd) { sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED); + // mEditor may be null if selection is created programatically. + createEditorIfNeeded("onSelectionChanged"); + // Invalidate even when selection range is empty, to remove previous highlight getEditor().mTextDisplayListIsValid = false; } |