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

am 4e28a6a8: Fix an IOOB exception 

* commit '4e28a6a844d057abd4d078fba5b2d2e2cd11747b':
  Fix an IOOB exception
main
Jean Chalard 2014-08-29 18:49:47 +00:00 committed by Android Git Automerger
parent 727cd74072 4e28a6a844
commit 3bd8eee3e8
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/latin/SuggestedWords.java
View File

@ -429,7 +429,7 @@ public class SuggestedWords {
*/ */
@UsedForTesting @UsedForTesting
public SuggestedWordInfo getTypedWordInfoOrNull() { public SuggestedWordInfo getTypedWordInfoOrNull() {
if (this == EMPTY) { if (SuggestedWords.INDEX_OF_TYPED_WORD >= size()) {
return null; return null;
} }
final SuggestedWordInfo info = getInfo(SuggestedWords.INDEX_OF_TYPED_WORD); final SuggestedWordInfo info = getInfo(SuggestedWords.INDEX_OF_TYPED_WORD);

10
tests/src/com/android/inputmethod/latin/SuggestedWordsTests.java
View File

@ -148,5 +148,15 @@ public class SuggestedWordsTests extends AndroidTestCase {
// Make sure getTypedWordInfoOrNull() returns null. // Make sure getTypedWordInfoOrNull() returns null.
assertNull(SuggestedWords.EMPTY.getTypedWordInfoOrNull()); assertNull(SuggestedWords.EMPTY.getTypedWordInfoOrNull());
final SuggestedWords emptySuggestedWords = new SuggestedWords(
new ArrayList<SuggestedWordInfo>(), null /* rawSuggestions */,
false /* typedWordValid */,
false /* willAutoCorrect */,
false /* isObsoleteSuggestions */,
SuggestedWords.INPUT_STYLE_NONE);
assertNull(emptySuggestedWords.getTypedWordInfoOrNull());
assertNull(SuggestedWords.EMPTY.getTypedWordInfoOrNull());
} }
} }