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/view/textservice/SpellCheckerSession.java

diff --git a/core/java/android/view/textservice/SpellCheckerSession.java b/core/java/android/view/textservice/SpellCheckerSession.java
index 9105f19..6ff3b9b 100644
--- a/core/java/android/view/textservice/SpellCheckerSession.java
+++ b/core/java/android/view/textservice/SpellCheckerSession.java
@@ -281,9 +281,6 @@
                         if (DBG) {
                             Log.w(TAG, "Get suggestions from the spell checker.");
                         }
-                        if (scp.mTextInfos.length != 1) {
-                            throw new IllegalArgumentException();
-                        }
                         try {
                             session.onGetSentenceSuggestionsMultiple(
                                     scp.mTextInfos, scp.mSuggestionsLimit);

core/java/android/widget/SpellChecker.java

diff --git a/core/java/android/widget/SpellChecker.java b/core/java/android/widget/SpellChecker.java
index a24faab..4f700a2 100644
--- a/core/java/android/widget/SpellChecker.java
+++ b/core/java/android/widget/SpellChecker.java
@@ -497,8 +497,8 @@
                 wordStart = regionEnd;
                 // TODO: Find the start position of the sentence.
                 // Set span with the context
-                final int spellCheckStart =  Math.min(
-                        start, Math.max(wordStart, regionEnd - WORD_ITERATOR_INTERVAL));
+                final int spellCheckStart =  Math.max(
+                        0, Math.min(wordStart, regionEnd - WORD_ITERATOR_INTERVAL));
                 if (regionEnd <= spellCheckStart) {
                     return;
                 }