diff options
| author | Gilles Debunne <debunne@google.com> | 2010-08-24 14:23:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-24 14:23:37 -0700 |
| commit | e2978c8dcafdf20c2b49999ec423cb5f76d4a583 (patch) | |
| tree | 3c381da6cecad3c37103d7b1d018be90082a41ef | |
| parent | b1bbe99aaa01f321ae94f0d5ba4505e528664cc7 (diff) | |
| parent | 4e765e002f135e2c4c30aff9e94d40e296a74d60 (diff) | |
| download | frameworks_base-e2978c8dcafdf20c2b49999ec423cb5f76d4a583.zip frameworks_base-e2978c8dcafdf20c2b49999ec423cb5f76d4a583.tar.gz frameworks_base-e2978c8dcafdf20c2b49999ec423cb5f76d4a583.tar.bz2 | |
Merge "Fix for an NPE in TextView." into gingerbread
| -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); |