aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/DictionaryCollection.java
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2013-08-28 19:24:28 +0900
committerKeisuke Kuroyanagi <ksk@google.com>2013-08-28 19:24:28 +0900
commitfe87f5f41744a633a2ed91af9b171bda2637649e (patch)
treec18fa410e84bfebf3e540fdf6b2aeb26b5a82556 /java/src/com/android/inputmethod/latin/DictionaryCollection.java
parent8e3a90e58ffd09692a23b29dc949a2f0fb3d774c (diff)
downloadlatinime-fe87f5f41744a633a2ed91af9b171bda2637649e.tar.gz
latinime-fe87f5f41744a633a2ed91af9b171bda2637649e.tar.xz
latinime-fe87f5f41744a633a2ed91af9b171bda2637649e.zip
Pass additionalFeaturesOptions for getSuggestions().
This fixes null pointer exceptions that are caused when getSuggestion() is called from spell checker. Change-Id: Ifc9e7abb900e1a4646e33c91022effde439673e4
Diffstat (limited to 'java/src/com/android/inputmethod/latin/DictionaryCollection.java')
-rw-r--r--java/src/com/android/inputmethod/latin/DictionaryCollection.java6
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 d05bb1e55..bf075140e 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryCollection.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryCollection.java
@@ -58,18 +58,18 @@ public final class DictionaryCollection extends Dictionary {
@Override
public ArrayList<SuggestedWordInfo> getSuggestions(final WordComposer composer,
final String prevWord, final ProximityInfo proximityInfo,
- final boolean blockOffensiveWords) {
+ final boolean blockOffensiveWords, final int[] additionalFeaturesOptions) {
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);
+ prevWord, proximityInfo, blockOffensiveWords, additionalFeaturesOptions);
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);
+ prevWord, proximityInfo, blockOffensiveWords, additionalFeaturesOptions);
if (null != sugg) suggestions.addAll(sugg);
}
return suggestions;