Fix for an NPE in TextView.

Change-Id: I0fca8f839cd444d9b70174078063efff5be499a3
This commit is contained in:
Gilles Debunne
2010-08-24 14:21:13 -07:00
parent 2703a42d16
commit 4e765e002f

View File

@@ -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);