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

Commit 65cf23eb authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Fix: NPE after turning on personalized suggestion. 

Bug: 13142176
Bug: 15428247
Change-Id: I236202e3c1b70a11d512c946798035087945c0ac
parent bdf745da

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

+7 −2
Original line number Diff line number Diff line
@@ -574,6 +574,12 @@ public class DictionaryFacilitator { 
            final ExpandableBinaryDictionary.AddMultipleDictionaryEntriesCallback callback) {

        final ExpandableBinaryDictionary personalizationDict =

                mDictionaries.getSubDict(Dictionary.TYPE_PERSONALIZATION);

        if (personalizationDict == null) {

            if (callback != null) {

                callback.onFinished();

            }

            return;

        }

        final ArrayList<LanguageModelParam> languageModelParams =

                LanguageModelParam.createLanguageModelParamsFrom(

                        personalizationDataChunk.mTokens,
@@ -581,8 +587,7 @@ public class DictionaryFacilitator { 
                        this /* dictionaryFacilitator */, spacingAndPunctuations,

                        new DistracterFilterCheckingIsInDictionary(

                                mDistracterFilter, personalizationDict));

        if (personalizationDict == null || languageModelParams == null

                || languageModelParams.isEmpty()) {

        if (languageModelParams == null || languageModelParams.isEmpty()) {

            if (callback != null) {

                callback.onFinished();

            }