diff options
| author |   Jean Chalard <jchalard@google.com> | 2011-09-09 02:18:11 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-09-09 02:18:11 -0700 |
| commit | a40aba002247ebeeef5ea5b0a56edf04528a7ed1 (patch) | |
| tree | 96032dbaff50e1f0a8078b407a0407f78f73d6fa /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | e3043592133ed6be4db53671bb85258771aa0e91 (diff) | |
| parent | 5955cfdaeae9ce2120769a4be965bdbac413bf79 (diff) | |
| download | latinime-a40aba002247ebeeef5ea5b0a56edf04528a7ed1.tar.gz latinime-a40aba002247ebeeef5ea5b0a56edf04528a7ed1.tar.xz latinime-a40aba002247ebeeef5ea5b0a56edf04528a7ed1.zip | |
Merge "Fix an NPE"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 00cd74b19..b467a32a2 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1875,14 +1875,16 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 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) { |