commit 7294cc5bfe653fde80b257bd39e3ff7eb11e102d
author Jean Chalard <jchalard@google.com> Fri Jan 10 12:47:40 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 10 12:47:41 2014 +0000
tree 634374dd15252853f0195431056d853a20f878d3
parent 5717c63a2b3876716986b24c86cc6c564c38e720
parent 7b6e999cd174f63501ccabdade5489d61107b341

Merge "Fix a test."

java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java

diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
index aa8bb2c..f733a9a 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
@@ -410,6 +410,7 @@
             final int sessionId, final Set<SuggestedWordInfo> suggestionSet) {
         for (final String key : mDictionaries.keySet()) {
             final Dictionary dictionary = mDictionaries.get(key);
+            if (null == dictionary) continue;
             suggestionSet.addAll(dictionary.getSuggestionsWithSessionId(composer, prevWord,
                     proximityInfo, blockOffensiveWords, additionalFeaturesOptions, sessionId));
         }