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

am ac82983f: am 6d7a0810: Merge "Fix a verifier error on ICS." into lmp-dev

Browse source 
* commit 'ac82983f65626c1db3fd878ba059807166ffbe36':
  Fix a verifier error on ICS.
This commit is contained in:
Jean Chalard 2014-07-28 12:14:20 +00:00 committed by Android Git Automerger
commit d33f7e84ab
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerSession.java
View file

@ -153,7 +153,7 @@ public final class AndroidSpellCheckerSession extends AndroidWordLevelSpellCheck
*/ */
private SentenceSuggestionsInfo[] splitAndSuggest(TextInfo[] textInfos, int suggestionsLimit) { private SentenceSuggestionsInfo[] splitAndSuggest(TextInfo[] textInfos, int suggestionsLimit) {
if (textInfos == null || textInfos.length == 0) { if (textInfos == null || textInfos.length == 0) {
return SentenceLevelAdapter.EMPTY_SENTENCE_SUGGESTIONS_INFOS; return SentenceLevelAdapter.getEmptySentenceSuggestionsInfo();
} }
SentenceLevelAdapter sentenceLevelAdapter; SentenceLevelAdapter sentenceLevelAdapter;
synchronized(this) { synchronized(this) {
@ -168,7 +168,7 @@ public final class AndroidSpellCheckerSession extends AndroidWordLevelSpellCheck
} }
} }
if (sentenceLevelAdapter == null) { if (sentenceLevelAdapter == null) {
return SentenceLevelAdapter.EMPTY_SENTENCE_SUGGESTIONS_INFOS; return SentenceLevelAdapter.getEmptySentenceSuggestionsInfo();
} }
final int infosSize = textInfos.length; final int infosSize = textInfos.length;
final SentenceSuggestionsInfo[] retval = new SentenceSuggestionsInfo[infosSize]; final SentenceSuggestionsInfo[] retval = new SentenceSuggestionsInfo[infosSize];

11
java/src/com/android/inputmethod/latin/spellcheck/SentenceLevelAdapter.java
View file

@ -35,9 +35,16 @@ import java.util.Locale;
* rewrite everything for any small change. * rewrite everything for any small change.
*/ */
public class SentenceLevelAdapter { public class SentenceLevelAdapter {
public static final SentenceSuggestionsInfo[] EMPTY_SENTENCE_SUGGESTIONS_INFOS = private static class EmptySentenceSuggestionsInfosInitializationHolder {
new SentenceSuggestionsInfo[] {}; public static final SentenceSuggestionsInfo[] EMPTY_SENTENCE_SUGGESTIONS_INFOS =
new SentenceSuggestionsInfo[]{};
}
private static final SuggestionsInfo EMPTY_SUGGESTIONS_INFO = new SuggestionsInfo(0, null); 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 * Container for split TextInfo parameters
*/ */