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

Commit eddadb91 authored by Mill Chen's avatar Mill Chen
Browse files

[Expressive design] Fix NPE issue 

Xml parser was not parsing the controller declared in the xml because
it didn't support the new preference type. That caused some pages crashed.

Fix: 407460860
Test: manual test
Flag: EXEMPT bugfix
Change-Id: Ic42626c42bda2dd298d08eb2879d21216106062d
parent 4a6d0cde

src/com/android/settings/core/PreferenceXmlParserUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ public class PreferenceXmlParserUtils { 
    public static final String PREF_SCREEN_TAG = "PreferenceScreen";

    private static final List<String> SUPPORTED_PREF_TYPES = Arrays.asList(

            "Preference", "PreferenceCategory", "PreferenceScreen", "SwitchPreferenceCompat",

            "com.android.settings.widget.WorkOnlyCategory");

            "com.android.settings.widget.WorkOnlyCategory",

            "com.android.settingslib.widget.SettingsTitlelessPreferenceCategory");

    public static final int PREPEND_VALUE = 0;

    public static final int APPEND_VALUE = 1;