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

Commit ce022748 authored by Jean Chalard's avatar Jean Chalard Committed by The Android Automerger
Browse files

Fix a crash 

Bug: 6137076
Change-Id: I05f9f72a2678d10d3400dab5fc71544276739dcf
parent 33dee3c2

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

+9 −5
Original line number Diff line number Diff line
@@ -535,10 +535,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
        registerReceiver(mReceiver, filter);

        mVoiceProxy = VoiceProxy.init(this, prefs, mHandler);



        final IntentFilter ringerModeFilter = new IntentFilter();

        ringerModeFilter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);

        registerReceiver(mFeedbackManager, ringerModeFilter);



        final IntentFilter packageFilter = new IntentFilter();

        packageFilter.addAction(Intent.ACTION_PACKAGE_ADDED);

        packageFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
@@ -551,11 +547,19 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
        registerReceiver(mDictionaryPackInstallReceiver, newDictFilter);

    }



    private void renewFeedbackReceiver() {

        if (null != mFeedbackManager) unregisterReceiver(mFeedbackManager);

        mFeedbackManager = new AudioAndHapticFeedbackManager(this, mSettingsValues);

        final IntentFilter ringerModeFilter = new IntentFilter();

        ringerModeFilter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);

        registerReceiver(mFeedbackManager, ringerModeFilter);

    }



    // Has to be package-visible for unit tests

    /* package */ void loadSettings() {

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

        mSettingsValues = new SettingsValues(mPrefs, this, mSubtypeSwitcher.getInputLocaleStr());

        mFeedbackManager = new AudioAndHapticFeedbackManager(this, mSettingsValues);

        renewFeedbackReceiver();

        resetContactsDictionary(null == mSuggest ? null : mSuggest.getContactsDictionary());

    }