aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-01-08 12:43:58 +0900
committerKeisuke Kuroyanagi <ksk@google.com>2014-01-08 12:43:58 +0900
commitb3c51630a6b8dc09c161c7720db7bae21b0cf27e (patch)
treed2ddd1052b10f10267eae9e00607fa5c675c05c3
parent385031557b7885d739d77e79f9cfc321659cbecf (diff)
downloadlatinime-b3c51630a6b8dc09c161c7720db7bae21b0cf27e.tar.gz
latinime-b3c51630a6b8dc09c161c7720db7bae21b0cf27e.tar.xz
latinime-b3c51630a6b8dc09c161c7720db7bae21b0cf27e.zip
Fix: NPE in LatinIME.loadSettnigs().
Change-Id: Icae6c74401a7a8f4da6015737f09f557640c0cca
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 291ed6d07..b7f035747 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -524,8 +524,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
}
if (currentSettingsValues.mUsePersonalizedDicts) {
if (mSubtypeSwitcher.isSystemLocaleSameAsLocaleOfAllEnabledSubtypes()) {
- PersonalizationDictionarySessionRegistrar.init(this,
- mInputLogic.mSuggest.mDictionaryFacilitator);
+ final DictionaryFacilitatorForSuggest dictionaryFacilitator =
+ (mInputLogic.mSuggest == null) ?
+ null : mInputLogic.mSuggest.mDictionaryFacilitator;
+ PersonalizationDictionarySessionRegistrar.init(this, dictionaryFacilitator);
} else {
PersonalizationDictionarySessionRegistrar.close(this);
}