summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorsatok <satok@google.com>2012-03-08 02:31:08 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-08 02:31:08 -0800
commit3154fc45e5294619c6f17c6e325036fbe8c70c5f (patch)
tree43c5c0b9362aea50713a56f85681082a62db287c /core/java
parent792ee0cc4d9415e45a16803c6fe3e60c53760e25 (diff)
parent2428ccbbde3ca1f6643a4952a6ca881dab80ce45 (diff)
downloadframeworks_base-3154fc45e5294619c6f17c6e325036fbe8c70c5f.zip
frameworks_base-3154fc45e5294619c6f17c6e325036fbe8c70c5f.tar.gz
frameworks_base-3154fc45e5294619c6f17c6e325036fbe8c70c5f.tar.bz2
Merge "Fix spell checker framework"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/view/textservice/SpellCheckerSession.java3
-rw-r--r--core/java/android/widget/SpellChecker.java4
2 files changed, 2 insertions, 5 deletions
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 @@ public class SpellCheckerSession {
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);
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 @@ public class SpellChecker implements SpellCheckerSessionListener {
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;
}