commit 3c38e1f269ad34a663db672e5cfb291fb1931987
author Keisuke Kuroyanagi <ksk@google.com> Thu Mar 27 03:12:07 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 27 03:12:07 2014 +0000
tree 58284d3e5ec72576ec385445b09f28d3fba910d3
parent 94f111f88176063aad45622a914a662a9e992c2f
parent 7b516d496d51101e5d9f37182e35ecc7a1de4765

Merge "Fix: NPE in isValidWord after dictionaries are closed."

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 8b8d577..ae2d7c9 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
@@ -480,6 +480,9 @@
             return false;
         }
         final Dictionaries dictionaries = mDictionaries;
+        if (dictionaries.mLocale == null) {
+            return false;
+        }
         final String lowerCasedWord = word.toLowerCase(dictionaries.mLocale);
         final Map<String, Dictionary> dictMap = dictionaries.mDictMap;
         for (final Dictionary dictionary : dictMap.values()) {