commit 3154fc45e5294619c6f17c6e325036fbe8c70c5f
author satok <satok@google.com> Thu Mar 08 02:31:08 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 08 02:31:08 2012 -0800
tree 43c5c0b9362aea50713a56f85681082a62db287c
parent 792ee0cc4d9415e45a16803c6fe3e60c53760e25
parent 2428ccbbde3ca1f6643a4952a6ca881dab80ce45

Merge "Fix spell checker framework"

core/java/android/widget/SpellChecker.java

diff --git a/core/java/android/widget/SpellChecker.java b/core/java/android/widget/SpellChecker.java
index 92c2e6e..4f700a2 100644
--- a/core/java/android/widget/SpellChecker.java
+++ b/core/java/android/widget/SpellChecker.java
@@ -290,7 +290,7 @@
 
     private SpellCheckSpan onGetSuggestionsInternal(
             SuggestionsInfo suggestionsInfo, int offset, int length) {
-        if (suggestionsInfo.getCookie() != mCookie) {
+        if (suggestionsInfo == null || suggestionsInfo.getCookie() != mCookie) {
             return null;
         }
         final Editable editable = (Editable) mTextView.getText();
@@ -335,9 +335,15 @@
 
         for (int i = 0; i < results.length; ++i) {
             final SentenceSuggestionsInfo ssi = results[i];
+            if (ssi == null) {
+                continue;
+            }
             SpellCheckSpan spellCheckSpan = null;
             for (int j = 0; j < ssi.getSuggestionsCount(); ++j) {
                 final SuggestionsInfo suggestionsInfo = ssi.getSuggestionsInfoAt(j);
+                if (suggestionsInfo == null) {
+                    continue;
+                }
                 final int offset = ssi.getOffsetAt(j);
                 final int length = ssi.getLengthAt(j);
                 final SpellCheckSpan scs = onGetSuggestionsInternal(