Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 37e169cd: Add a safety net to set range span in the spell checker

Browse Source 
* commit '37e169cd1429c76a0223d8fdd77622ead718bbff':
  Add a safety net to set range span in the spell checker
This commit is contained in:
satok
2012-05-10 23:15:57 -07:00
committed by Android Git Automerger
parent ef9876a651 37e169cd14
commit 0b8d272eed
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/widget/SpellChecker.java
View File

@@ -473,8 +473,16 @@ public class SpellChecker implements SpellCheckerSessionListener {
private Object mRange = new Object();
public void parse(int start, int end) {
if (end > start) {
setRangeSpan((Editable) mTextView.getText(), start, end);
final int max = mTextView.length();
final int parseEnd;
if (end > max) {
Log.w(TAG, "Parse invalid region, from " + start + " to " + end);
parseEnd = max;
} else {
parseEnd = end;
}
if (parseEnd > start) {
setRangeSpan((Editable) mTextView.getText(), start, parseEnd);
parse();
}
}
@@ -612,6 +620,8 @@ public class SpellChecker implements SpellCheckerSessionListener {
break;
}
if (spellCheckEnd <= spellCheckStart) {
Log.w(TAG, "Trying to spellcheck invalid region, from "
+ start + " to " + end);
break;
}
if (createSpellCheckSpan) {