From b3c51630a6b8dc09c161c7720db7bae21b0cf27e Mon Sep 17 00:00:00 2001
From: Keisuke Kuroyanagi <ksk@google.com>
Date: Wed, 8 Jan 2014 12:43:58 +0900
Subject: Fix: NPE in LatinIME.loadSettnigs().

Change-Id: Icae6c74401a7a8f4da6015737f09f557640c0cca
---
 java/src/com/android/inputmethod/latin/LatinIME.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'java/src')

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);
             }
-- 
cgit v1.2.3-83-g751a