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

Commit a40aba00 authored by Jean Chalard's avatar Jean Chalard Committed by Android (Google) Code Review
Browse files

Merge "Fix an NPE"

parents e3043592 5955cfda

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

+10 −8
Original line number Original line Diff line number Diff line
@@ -1875,15 +1875,17 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
            return;

            return;

        }

        }





        if (null != mSuggest && null != mUserUnigramDictionary) {

            final boolean selectedATypedWordAndItsInUserUnigramDic =

            final boolean selectedATypedWordAndItsInUserUnigramDic =

                    !selectedANotTypedWord && mUserUnigramDictionary.isValidWord(suggestion);

                    !selectedANotTypedWord && mUserUnigramDictionary.isValidWord(suggestion);

            final boolean isValidWord = AutoCorrection.isValidWord(

            final boolean isValidWord = AutoCorrection.isValidWord(

                    mSuggest.getUnigramDictionaries(), suggestion, true);

                    mSuggest.getUnigramDictionaries(), suggestion, true);

        final boolean needsToAddToUserUnigramDictionary = selectedATypedWordAndItsInUserUnigramDic

            final boolean needsToAddToUserUnigramDictionary =

                || !isValidWord;

                    selectedATypedWordAndItsInUserUnigramDic || !isValidWord;

            if (needsToAddToUserUnigramDictionary) {

            if (needsToAddToUserUnigramDictionary) {

                mUserUnigramDictionary.addWord(suggestion.toString(), frequencyDelta);

                mUserUnigramDictionary.addWord(suggestion.toString(), frequencyDelta);

            }

            }

        }





        if (mUserBigramDictionary != null) {

        if (mUserBigramDictionary != null) {

            // We don't want to register as bigrams words separated by a separator.

            // We don't want to register as bigrams words separated by a separator.