Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cf265b3 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

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

parents e6a39d56 67b9337b

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

+3 −2
Original line number Diff line number Diff line
@@ -1957,7 +1957,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
        // expect to receive non-words.

        if (!mCurrentSettings.mCorrectionEnabled) return null;



        if (mUserHistoryDictionary != null) {

        final UserHistoryDictionary userHistoryDictionary = mUserHistoryDictionary;

        if (userHistoryDictionary != null) {

            final CharSequence prevWord

                    = mConnection.getPreviousWord(mCurrentSettings.mWordSeparators);

            final String secondWord;
@@ -1972,7 +1973,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 
            final int maxFreq = AutoCorrection.getMaxFrequency(

                    mSuggest.getUnigramDictionaries(), suggestion);

            if (maxFreq == 0) return null;

            mUserHistoryDictionary.addToUserHistory(null == prevWord ? null : prevWord.toString(),

            userHistoryDictionary.addToUserHistory(null == prevWord ? null : prevWord.toString(),

                    secondWord, maxFreq > 0);

            return prevWord;

        }