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

Commit e6560252 authored by satok's avatar satok Committed by Android Git Automerger
Browse files

am 72cd8466: Merge "Fix NPE in user history bigram dictionary" into jb-dev 

* commit '72cd8466':
  Fix NPE in user history bigram dictionary
parents d30cfee5 72cd8466

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -454,6 +454,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 




    // Has to be package-visible for unit tests

    // Has to be package-visible for unit tests

    /* package */ void loadSettings() {

    /* package */ void loadSettings() {

        // Note that the calling sequence of onCreate() and onCurrentInputMethodSubtypeChanged()

        // is not guaranteed. It may even be called at the same time on a different thread.

        if (null == mPrefs) mPrefs = PreferenceManager.getDefaultSharedPreferences(this);

        if (null == mPrefs) mPrefs = PreferenceManager.getDefaultSharedPreferences(this);

        final RunInLocale<SettingsValues> job = new RunInLocale<SettingsValues>() {

        final RunInLocale<SettingsValues> job = new RunInLocale<SettingsValues>() {

            @Override

            @Override
@@ -495,6 +497,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 




        resetContactsDictionary(oldContactsDictionary);

        resetContactsDictionary(oldContactsDictionary);





        // Note that the calling sequence of onCreate() and onCurrentInputMethodSubtypeChanged()

        // is not guaranteed. It may even be called at the same time on a different thread.

        if (null == mPrefs) mPrefs = PreferenceManager.getDefaultSharedPreferences(this);

        mUserHistoryDictionary = new UserHistoryDictionary(

        mUserHistoryDictionary = new UserHistoryDictionary(

                this, localeStr, Suggest.DIC_USER_HISTORY, mPrefs);

                this, localeStr, Suggest.DIC_USER_HISTORY, mPrefs);

        mSuggest.setUserHistoryDictionary(mUserHistoryDictionary);

        mSuggest.setUserHistoryDictionary(mUserHistoryDictionary);
@@ -624,6 +629,8 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 




    @Override

    @Override

    public void onCurrentInputMethodSubtypeChanged(InputMethodSubtype subtype) {

    public void onCurrentInputMethodSubtypeChanged(InputMethodSubtype subtype) {

        // Note that the calling sequence of onCreate() and onCurrentInputMethodSubtypeChanged()

        // is not guaranteed. It may even be called at the same time on a different thread.

        mSubtypeSwitcher.updateSubtype(subtype);

        mSubtypeSwitcher.updateSubtype(subtype);

    }

    }