Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bd8eee3 authored by Jean Chalard's avatar Jean Chalard Committed by Android Git Automerger
Browse files

am 4e28a6a8: Fix an IOOB exception 

* commit '4e28a6a8':
  Fix an IOOB exception
parents 727cd740 4e28a6a8

java/src/com/android/inputmethod/latin/SuggestedWords.java

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ public class SuggestedWords { 
     */

    @UsedForTesting

    public SuggestedWordInfo getTypedWordInfoOrNull() {

        if (this == EMPTY) {

        if (SuggestedWords.INDEX_OF_TYPED_WORD >= size()) {

            return null;

        }

        final SuggestedWordInfo info = getInfo(SuggestedWords.INDEX_OF_TYPED_WORD);

tests/src/com/android/inputmethod/latin/SuggestedWordsTests.java

+10 −0
Original line number Diff line number Diff line
@@ -148,5 +148,15 @@ public class SuggestedWordsTests extends AndroidTestCase { 


        // Make sure getTypedWordInfoOrNull() returns null.

        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());

    }

}