commit e2978c8dcafdf20c2b49999ec423cb5f76d4a583
author Gilles Debunne <debunne@google.com> Tue Aug 24 14:23:37 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 24 14:23:37 2010 -0700
tree 3c381da6cecad3c37103d7b1d018be90082a41ef
parent b1bbe99aaa01f321ae94f0d5ba4505e528664cc7
parent 4e765e002f135e2c4c30aff9e94d40e296a74d60

Merge "Fix for an NPE in TextView." into gingerbread

core/java/android/widget/TextView.java

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