commit a40aba002247ebeeef5ea5b0a56edf04528a7ed1
author Jean Chalard <jchalard@google.com> Fri Sep 09 02:18:11 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 09 02:18:11 2011 -0700
tree 96032dbaff50e1f0a8078b407a0407f78f73d6fa
parent e3043592133ed6be4db53671bb85258771aa0e91
parent 5955cfdaeae9ce2120769a4be965bdbac413bf79

Merge "Fix an NPE"

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 00cd74b..b467a32 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1875,14 +1875,16 @@
             return;
         }
 
-        final boolean selectedATypedWordAndItsInUserUnigramDic =
-                !selectedANotTypedWord && mUserUnigramDictionary.isValidWord(suggestion);
-        final boolean isValidWord = AutoCorrection.isValidWord(
-                mSuggest.getUnigramDictionaries(), suggestion, true);
-        final boolean needsToAddToUserUnigramDictionary = selectedATypedWordAndItsInUserUnigramDic
-                || !isValidWord;
-        if (needsToAddToUserUnigramDictionary) {
-            mUserUnigramDictionary.addWord(suggestion.toString(), frequencyDelta);
+        if (null != mSuggest && null != mUserUnigramDictionary) {
+            final boolean selectedATypedWordAndItsInUserUnigramDic =
+                    !selectedANotTypedWord && mUserUnigramDictionary.isValidWord(suggestion);
+            final boolean isValidWord = AutoCorrection.isValidWord(
+                    mSuggest.getUnigramDictionaries(), suggestion, true);
+            final boolean needsToAddToUserUnigramDictionary =
+                    selectedATypedWordAndItsInUserUnigramDic || !isValidWord;
+            if (needsToAddToUserUnigramDictionary) {
+                mUserUnigramDictionary.addWord(suggestion.toString(), frequencyDelta);
+            }
         }
 
         if (mUserBigramDictionary != null) {