From 4e765e002f135e2c4c30aff9e94d40e296a74d60 Mon Sep 17 00:00:00 2001
From: Gilles Debunne <debunne@google.com>
Date: Tue, 24 Aug 2010 14:21:13 -0700
Subject: [PATCH] Fix for an NPE in TextView.

Change-Id: I0fca8f839cd444d9b70174078063efff5be499a3
---
 core/java/android/widget/TextView.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 28234bfe9d1c0..2f76bd09d4fda 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);