Fix for NPE in TextView.

Bug http://b/issue?id=2941549

Change-Id: Id5cbf0a3b2b68f450a9271333b96d41b01aa9f5c

1 files changed, 5 insertions, 0 deletions

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 2f76bd0..8ab8f9d 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -7117,6 +7117,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
 
         int selectionStart, selectionEnd;
 
+        // selectionModifierCursorController is not null at that point
         SelectionModifierCursorController selectionModifierCursorController =
             ((SelectionModifierCursorController) mSelectionModifierCursorController);
         int minOffset = selectionModifierCursorController.getMinTouchOffset();
@@ -7140,6 +7141,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
     }
     
     private String getWordForDictionary() {
+        if (mSelectionModifierCursorController == null) {
+            return null;
+        }
+
         int offset = ((SelectionModifierCursorController) mSelectionModifierCursorController).
                      getMinTouchOffset();