aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-03-27 03:16:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-27 03:16:40 +0000
commit79fccd5432d50f815daf88380a9a7f5cce2155e5 (patch)
tree58284d3e5ec72576ec385445b09f28d3fba910d3 /java/src
parentf60c43d34af1c93b94f009ac6e645154bd933c8a (diff)
parent3c38e1f269ad34a663db672e5cfb291fb1931987 (diff)
downloadlatinime-79fccd5432d50f815daf88380a9a7f5cce2155e5.tar.gz
latinime-79fccd5432d50f815daf88380a9a7f5cce2155e5.tar.xz
latinime-79fccd5432d50f815daf88380a9a7f5cce2155e5.zip
am 3c38e1f2: Merge "Fix: NPE in isValidWord after dictionaries are closed."
* commit '3c38e1f269ad34a663db672e5cfb291fb1931987': 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()) {