am 1b400c77: Merge "Fix for NPE in TextView." into gingerbread

Merge commit '1b400c7763e63505bafd496953764c3e97c2be5b' into gingerbread-plus-aosp

* commit '1b400c7763e63505bafd496953764c3e97c2be5b':
  Fix for NPE in TextView.

1 files changed, 5 insertions, 0 deletions

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index d9d5259..dde16ea 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -7122,6 +7122,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();
@@ -7145,6 +7146,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
     }
     
     private String getWordForDictionary() {
+        if (mSelectionModifierCursorController == null) {
+            return null;
+        }
+
         int offset = ((SelectionModifierCursorController) mSelectionModifierCursorController).
                      getMinTouchOffset();