diff options
author | 2014-05-16 09:33:27 +0000 | |
---|---|---|
committer | 2014-05-16 09:33:28 +0000 | |
commit | d1f9ce00db1013e38ce07979aae364287435fa37 (patch) | |
tree | ef53e2af9c2b0e2e0142fc97e35d3f8903a3b2cd /java/src/com/android/inputmethod/latin/DictionaryCollection.java | |
parent | 91e4ba742a667d178040c173076da0173d74d6e9 (diff) | |
parent | 09c72207c634ec5e1350aff23f7abe7bb47e5671 (diff) | |
download | latinime-d1f9ce00db1013e38ce07979aae364287435fa37.tar.gz latinime-d1f9ce00db1013e38ce07979aae364287435fa37.tar.xz latinime-d1f9ce00db1013e38ce07979aae364287435fa37.zip |
Merge "Make session id mandatory for getSuggestions."
Diffstat (limited to 'java/src/com/android/inputmethod/latin/DictionaryCollection.java')
-rw-r--r-- | java/src/com/android/inputmethod/latin/DictionaryCollection.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryCollection.java b/java/src/com/android/inputmethod/latin/DictionaryCollection.java index 16173fffc..239fd067a 100644 --- a/java/src/com/android/inputmethod/latin/DictionaryCollection.java +++ b/java/src/com/android/inputmethod/latin/DictionaryCollection.java @@ -59,20 +59,20 @@ public final class DictionaryCollection extends Dictionary { public ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer composer, final String prevWord, final ProximityInfo proximityInfo, final boolean blockOffensiveWords, final int[] additionalFeaturesOptions, - final float[] inOutLanguageWeight) { + final int sessionId, final float[] inOutLanguageWeight) { final CopyOnWriteArrayList<Dictionary> dictionaries = mDictionaries; if (dictionaries.isEmpty()) return null; // To avoid creating unnecessary objects, we get the list out of the first // dictionary and add the rest to it if not null, hence the get(0) ArrayList<SuggestedWordInfo> suggestions = dictionaries.get(0).getSuggestions(composer, prevWord, proximityInfo, blockOffensiveWords, additionalFeaturesOptions, - inOutLanguageWeight); + sessionId, inOutLanguageWeight); if (null == suggestions) suggestions = CollectionUtils.newArrayList(); final int length = dictionaries.size(); for (int i = 1; i < length; ++ i) { final ArrayList<SuggestedWordInfo> sugg = dictionaries.get(i).getSuggestions(composer, prevWord, proximityInfo, blockOffensiveWords, additionalFeaturesOptions, - inOutLanguageWeight); + sessionId, inOutLanguageWeight); if (null != sugg) suggestions.addAll(sugg); } return suggestions; |