diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-07-28 12:09:04 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-28 12:09:04 +0000 |
| commit | ac82983f65626c1db3fd878ba059807166ffbe36 (patch) | |
| tree | 84805d11fc5aff39245898448e6998c6f12338e9 /java/src | |
| parent | c140938d99b2b34e95d7e45425396f280a486043 (diff) | |
| parent | 6d7a08107cd62620a2a07d445686e76c2d660bcf (diff) | |
| download | latinime-ac82983f65626c1db3fd878ba059807166ffbe36.tar.gz latinime-ac82983f65626c1db3fd878ba059807166ffbe36.tar.xz latinime-ac82983f65626c1db3fd878ba059807166ffbe36.zip | |
am 6d7a0810: Merge "Fix a verifier error on ICS." into lmp-dev
* commit '6d7a08107cd62620a2a07d445686e76c2d660bcf':
Fix a verifier error on ICS.
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/spellcheck/SentenceLevelAdapter.java | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java index 14ab2dbbf..34e01197a 100644 --- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java +++ b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java @@ -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]; diff --git a/java/src/com/android/inputmethod/latin/spellcheck/SentenceLevelAdapter.java b/java/src/com/android/inputmethod/latin/spellcheck/SentenceLevelAdapter.java index ae582ea25..51c4b1ee8 100644 --- a/java/src/com/android/inputmethod/latin/spellcheck/SentenceLevelAdapter.java +++ b/java/src/com/android/inputmethod/latin/spellcheck/SentenceLevelAdapter.java @@ -35,9 +35,16 @@ import java.util.Locale; * rewrite everything for any small change. */ public class SentenceLevelAdapter { - public static final SentenceSuggestionsInfo[] EMPTY_SENTENCE_SUGGESTIONS_INFOS = - new SentenceSuggestionsInfo[] {}; + 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 */ |