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

Fix an IOOB exception

Browse source 
Bug: 17316001
Change-Id: Iaa2cfd30ebbe0d49e10a5c3a30336e06817d0a8b
This commit is contained in:
Jean Chalard 2014-08-29 13:18:23 +09:00
parent f2eadbb497
commit 4e28a6a844
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());
} }
} }