commit 5717c63a2b3876716986b24c86cc6c564c38e720
author Keisuke Kuroyanagi <ksk@google.com> Fri Jan 10 21:42:08 2014 +0900
committer Keisuke Kuroyanagi <ksk@google.com> Fri Jan 10 21:42:08 2014 +0900
tree 6e023dcf34610553668c9de540f0bc35254e8120
parent db0adf86a4c615ca8838238a1c318b1fbc05111e

Fix possible NPE in DictionaryFacilitatorForSuggest.

Change-Id: I57792b7417b5f1acbb99e6ea60250eb44b193785

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));
         }