From da70b90aa77f2caf88ebd0d102c7a28e0f9726ad Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Mon, 28 Jul 2014 17:33:52 +0900 Subject: [PATCH] Fix a verifier error on ICS. Bug: 16530557 Change-Id: I271c5884995a1d5f8a1cb7aee6f52d17fabb9e72 --- .../latin/spellcheck/AndroidSpellCheckerSession.java | 4 ++-- .../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 */