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

Commit 4e86bf67 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Settings: Fix settings force close in monkey test."

parents 4f279db4 d452c75e

src/com/android/settings/datausage/UnrestrictedDataAccess.java

+3 −0
Original line number Diff line number Diff line
@@ -212,6 +212,9 @@ public class UnrestrictedDataAccess extends SettingsPreferenceFragment 
    public boolean onPreferenceChange(Preference preference, Object newValue) {

        if (preference instanceof AccessPreference) {

            AccessPreference accessPreference = (AccessPreference) preference;

            if (accessPreference.mState == null) {

                return false;

            }

            boolean whitelisted = newValue == Boolean.TRUE;

            mDataSaverBackend.setIsWhitelisted(accessPreference.mEntry.info.uid,

                    accessPreference.mEntry.info.packageName, whitelisted);

src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java

+3 −0
Original line number Diff line number Diff line
@@ -211,6 +211,9 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment 
    }



    private void updateUserDictionaryPreference(Preference userDictionaryPreference) {

        if (userDictionaryPreference == null) {

            return;

        }

        final Activity activity = getActivity();

        final TreeSet<String> localeSet = UserDictionaryList.getUserDictionaryLocalesSet(activity);

        if (null == localeSet) {