nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Don't kill LatinIME if the spellchecker crashes."

Browse source
This commit is contained in:
Jean Chalard 2011-09-15 00:13:45 -07:00 committed by Android (Google) Code Review
commit b568a627b4
1 changed files with 67 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
View file

@ -327,6 +327,7 @@ public class AndroidSpellCheckerService extends SpellCheckerService {
@Override @Override
public SuggestionsInfo onGetSuggestions(final TextInfo textInfo, public SuggestionsInfo onGetSuggestions(final TextInfo textInfo,
final int suggestionsLimit) { final int suggestionsLimit) {
try {
final String text = textInfo.getText(); final String text = textInfo.getText();
if (shouldFilterOut(text)) return EMPTY_SUGGESTIONS_INFO; if (shouldFilterOut(text)) return EMPTY_SUGGESTIONS_INFO;
@ -343,7 +344,8 @@ public class AndroidSpellCheckerService extends SpellCheckerService {
proximities = new int[] { character }; proximities = new int[] { character };
} else { } else {
proximities = Arrays.copyOfRange(SpellCheckerProximityInfo.PROXIMITY, proximities = Arrays.copyOfRange(SpellCheckerProximityInfo.PROXIMITY,
proximityIndex, proximityIndex + SpellCheckerProximityInfo.ROW_SIZE); proximityIndex,
proximityIndex + SpellCheckerProximityInfo.ROW_SIZE);
} }
composer.add(character, proximities, composer.add(character, proximities,
WordComposer.NOT_A_COORDINATE, WordComposer.NOT_A_COORDINATE); WordComposer.NOT_A_COORDINATE, WordComposer.NOT_A_COORDINATE);
@ -388,6 +390,15 @@ public class AndroidSpellCheckerService extends SpellCheckerService {
| (result.mLooksLikeTypo | (result.mLooksLikeTypo
? SuggestionsInfo.RESULT_ATTR_LOOKS_LIKE_TYPO : 0); ? SuggestionsInfo.RESULT_ATTR_LOOKS_LIKE_TYPO : 0);
return new SuggestionsInfo(flags, result.mSuggestions); return new SuggestionsInfo(flags, result.mSuggestions);
} catch (RuntimeException e) {
// Don't kill the keyboard if there is a bug in the spell checker
if (DBG) {
throw e;
} else {
Log.e(TAG, "Exception while spellcheking: " + e);
return EMPTY_SUGGESTIONS_INFO;
}
}
} }
} }
} }