nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix possible NPE from a concurrent problem in LatinIME"

Browse source
This commit is contained in:
Satoshi Kataoka 2012-06-21 22:16:48 -07:00 committed by Android (Google) Code Review
commit 2cf265b345
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -1957,7 +1957,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// expect to receive non-words. // expect to receive non-words.
if (!mCurrentSettings.mCorrectionEnabled) return null; if (!mCurrentSettings.mCorrectionEnabled) return null;
if (mUserHistoryDictionary != null) { final UserHistoryDictionary userHistoryDictionary = mUserHistoryDictionary;
if (userHistoryDictionary != null) {
final CharSequence prevWord final CharSequence prevWord
= mConnection.getPreviousWord(mCurrentSettings.mWordSeparators); = mConnection.getPreviousWord(mCurrentSettings.mWordSeparators);
final String secondWord; final String secondWord;
@ -1972,7 +1973,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
final int maxFreq = AutoCorrection.getMaxFrequency( final int maxFreq = AutoCorrection.getMaxFrequency(
mSuggest.getUnigramDictionaries(), suggestion); mSuggest.getUnigramDictionaries(), suggestion);
if (maxFreq == 0) return null; if (maxFreq == 0) return null;
mUserHistoryDictionary.addToUserHistory(null == prevWord ? null : prevWord.toString(), userHistoryDictionary.addToUserHistory(null == prevWord ? null : prevWord.toString(),
secondWord, maxFreq > 0); secondWord, maxFreq > 0);
return prevWord; return prevWord;
} }