aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-03-27 03:12:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-27 03:12:07 +0000
commit3c38e1f269ad34a663db672e5cfb291fb1931987 (patch)
tree58284d3e5ec72576ec385445b09f28d3fba910d3 /java/src
parent94f111f88176063aad45622a914a662a9e992c2f (diff)
parent7b516d496d51101e5d9f37182e35ecc7a1de4765 (diff)
downloadlatinime-3c38e1f269ad34a663db672e5cfb291fb1931987.tar.gz
latinime-3c38e1f269ad34a663db672e5cfb291fb1931987.tar.xz
latinime-3c38e1f269ad34a663db672e5cfb291fb1931987.zip
Merge "Fix: NPE in isValidWord after dictionaries are closed."
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
index 8b8d5776e..ae2d7c9c6 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
@@ -480,6 +480,9 @@ public class DictionaryFacilitatorForSuggest {
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()) {