diff options
| author |   Jean Chalard <jchalard@google.com> | 2011-09-09 18:08:53 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2011-09-09 18:08:53 +0900 |
| commit | 5955cfdaeae9ce2120769a4be965bdbac413bf79 (patch) | |
| tree | 0b5da79088d92edc0b930240bcf515b29ab84407 /java/src | |
| parent | a08a7e99b4133eb6647ddc27ac60d8ee4c9eddba (diff) | |
| download | latinime-5955cfdaeae9ce2120769a4be965bdbac413bf79.tar.gz latinime-5955cfdaeae9ce2120769a4be965bdbac413bf79.tar.xz latinime-5955cfdaeae9ce2120769a4be965bdbac413bf79.zip | |
Fix an NPE
I think only the monkey can realistically stumble on this one,
but still.
Bug: 5276917
Change-Id: I0d9f76e4786973d3695fcd46127f0bed46621c33
Diffstat (limited to 'java/src')
| -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 08af5c5e3..843185181 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1872,14 +1872,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) { |