diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-06-09 05:35:31 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-06-09 05:35:32 +0000 |
| commit | 9f02a67c77a1fdfb011bd93d6caf2f455ba358f6 (patch) | |
| tree | afb87c492c6ed746859b570ae43a94aa144c6128 /java/src | |
| parent | f4d3a6a31af8d0ea9c397c15cbe8cccb4c727e9a (diff) | |
| parent | 65cf23eb38ee03237bbdfffb241b84e1bb8ed3dd (diff) | |
| download | latinime-9f02a67c77a1fdfb011bd93d6caf2f455ba358f6.tar.gz latinime-9f02a67c77a1fdfb011bd93d6caf2f455ba358f6.tar.xz latinime-9f02a67c77a1fdfb011bd93d6caf2f455ba358f6.zip | |
Merge "Fix: NPE after turning on personalized suggestion."
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/DictionaryFacilitator.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java index 48b6a4622..bdf39238a 100644 --- a/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java +++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitator.java @@ -574,6 +574,12 @@ public class DictionaryFacilitator { final ExpandableBinaryDictionary.AddMultipleDictionaryEntriesCallback callback) { final ExpandableBinaryDictionary personalizationDict = mDictionaries.getSubDict(Dictionary.TYPE_PERSONALIZATION); + if (personalizationDict == null) { + if (callback != null) { + callback.onFinished(); + } + return; + } final ArrayList<LanguageModelParam> languageModelParams = LanguageModelParam.createLanguageModelParamsFrom( personalizationDataChunk.mTokens, @@ -581,8 +587,7 @@ public class DictionaryFacilitator { this /* dictionaryFacilitator */, spacingAndPunctuations, new DistracterFilterCheckingIsInDictionary( mDistracterFilter, personalizationDict)); - if (personalizationDict == null || languageModelParams == null - || languageModelParams.isEmpty()) { + if (languageModelParams == null || languageModelParams.isEmpty()) { if (callback != null) { callback.onFinished(); } |