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

Commit 67b9337b authored by Satoshi Kataoka's avatar Satoshi Kataoka
Browse files

Fix possible NPE from a concurrent problem in LatinIME

Bug: 6620746
Change-Id: Icc18de92d7edc6888c712c2cf5ce479a65f8bfad
parent d2f210db
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -1971,7 +1971,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
        // want corrections enabled or learned.
        if (!mCurrentSettings.isCorrectionOn()) return null;

        if (mUserHistoryDictionary != null) {
        final UserHistoryDictionary userHistoryDictionary = mUserHistoryDictionary;
        if (userHistoryDictionary != null) {
            final CharSequence prevWord
                    = mConnection.getPreviousWord(mCurrentSettings.mWordSeparators);
            final String secondWord;
@@ -1986,7 +1987,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;
        }