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

Commit 4e658ba9 authored by Jean Chalard's avatar Jean Chalard
Browse files

Fix an NPE 

It seems the user dictionary fragment does not tolerate being
called by name, and needs to be called only by action.

Bug: 5242122
Change-Id: I6b954db549b98d4d0076fdce8e00d336fc18b6e3
parent eb913af2

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

+3 −1
Original line number Diff line number Diff line
@@ -141,8 +141,10 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment 
            // not present or disabled. In this case we need to remove the preference.

            getPreferenceScreen().removePreference(userDictionaryPreference);

        } else if (localeList.size() <= 1) {

            final Intent intent =

                    new Intent(UserDictionaryList.USER_DICTIONARY_SETTINGS_INTENT_ACTION);

            userDictionaryPreference.setTitle(R.string.user_dict_single_settings_title);

            userDictionaryPreference.setFragment(UserDictionarySettings.class.getName());

            userDictionaryPreference.setIntent(intent);

            // If the size of localeList is 0, we don't set the locale parameter in the

            // extras. This will be interpreted by the UserDictionarySettings class as

            // meaning "the current locale".

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

+1 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import java.util.TreeSet; 


public class UserDictionaryList extends SettingsPreferenceFragment {



    private static final String USER_DICTIONARY_SETTINGS_INTENT_ACTION =

    public static final String USER_DICTIONARY_SETTINGS_INTENT_ACTION =

            "android.settings.USER_DICTIONARY_SETTINGS";



    @Override
@@ -101,7 +101,6 @@ public class UserDictionaryList extends SettingsPreferenceFragment { 
            newPref.getExtras().putString("locale", locale);

        }

        newPref.setIntent(intent);

        newPref.setFragment(UserDictionarySettings.class.getName());

        return newPref;

    }