diff options
| author | Gilles Debunne <debunne@google.com> | 2010-08-24 14:21:13 -0700 |
|---|---|---|
| committer | Gilles Debunne <debunne@google.com> | 2010-08-24 14:21:13 -0700 |
| commit | 4e765e002f135e2c4c30aff9e94d40e296a74d60 (patch) | |
| tree | bcaac7467386a477c7534d6c4f23942332198d74 /core/java/android/widget/TextView.java | |
| parent | 2703a42d16af0e62da1bba02b6c935d98debf936 (diff) | |
| download | frameworks_base-4e765e002f135e2c4c30aff9e94d40e296a74d60.zip frameworks_base-4e765e002f135e2c4c30aff9e94d40e296a74d60.tar.gz frameworks_base-4e765e002f135e2c4c30aff9e94d40e296a74d60.tar.bz2 | |
Fix for an NPE in TextView.
Change-Id: I0fca8f839cd444d9b70174078063efff5be499a3
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 28234bf..2f76bd0 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -6469,10 +6469,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (!mFrozenWithFocus || (selStart < 0 || selEnd < 0)) { boolean selMoved = mSelectionMoved; - final int touchOffset = - ((SelectionModifierCursorController) mSelectionModifierCursorController). - getMinTouchOffset(); - Selection.setSelection((Spannable) mText, touchOffset); + if (mSelectionModifierCursorController != null) { + final int touchOffset = + ((SelectionModifierCursorController) mSelectionModifierCursorController). + getMinTouchOffset(); + Selection.setSelection((Spannable) mText, touchOffset); + } if (mMovement != null) { mMovement.onTakeFocus(this, (Spannable) mText, direction); |