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

Commit 6d7a0810 authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

Merge "Fix a verifier error on ICS." into lmp-dev

parents bfcd98ed da70b90a

java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public final class AndroidSpellCheckerSession extends AndroidWordLevelSpellCheck 
     */

    private SentenceSuggestionsInfo[] splitAndSuggest(TextInfo[] textInfos, int suggestionsLimit) {

        if (textInfos == null || textInfos.length == 0) {

            return SentenceLevelAdapter.EMPTY_SENTENCE_SUGGESTIONS_INFOS;

            return SentenceLevelAdapter.getEmptySentenceSuggestionsInfo();

        }

        SentenceLevelAdapter sentenceLevelAdapter;

        synchronized(this) {
@@ -168,7 +168,7 @@ public final class AndroidSpellCheckerSession extends AndroidWordLevelSpellCheck 
            }

        }

        if (sentenceLevelAdapter == null) {

            return SentenceLevelAdapter.EMPTY_SENTENCE_SUGGESTIONS_INFOS;

            return SentenceLevelAdapter.getEmptySentenceSuggestionsInfo();

        }

        final int infosSize = textInfos.length;

        final SentenceSuggestionsInfo[] retval = new SentenceSuggestionsInfo[infosSize];

java/src/com/android/inputmethod/latin/spellcheck/SentenceLevelAdapter.java

+9 −2
Original line number Diff line number Diff line
@@ -35,9 +35,16 @@ import java.util.Locale; 
 * rewrite everything for any small change.

 */

public class SentenceLevelAdapter {

    private static class EmptySentenceSuggestionsInfosInitializationHolder {

        public static final SentenceSuggestionsInfo[] EMPTY_SENTENCE_SUGGESTIONS_INFOS =

                new SentenceSuggestionsInfo[]{};

    }

    private static final SuggestionsInfo EMPTY_SUGGESTIONS_INFO = new SuggestionsInfo(0, null);



    public static SentenceSuggestionsInfo[] getEmptySentenceSuggestionsInfo() {

        return EmptySentenceSuggestionsInfosInitializationHolder.EMPTY_SENTENCE_SUGGESTIONS_INFOS;

    }



    /**

     * Container for split TextInfo parameters

     */