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

Commit aec1d977 authored by Edgar Wang's avatar Edgar Wang
Browse files

Dynamic Injection into PreferenceCategory 

- Avoid NPE when groupkey is null

Bug: 335592049
Change-Id: I810220d18e55351a280cff08b74b37130607168c
Test: robotest & manual
parent ea89a3cb

src/com/android/settings/dashboard/DashboardFragment.java

+7 −3
Original line number Diff line number Diff line
@@ -545,12 +545,16 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment 
                        getActivity(), this, forceRoundedIcons, pref, tile, key,

                        mPlaceholderPreferenceController.getOrder());

                if (Flags.dynamicInjectionCategory()) {

                    if (tile.hasGroupKey()) {

                        Preference group = screen.findPreference(tile.getGroupKey());

                    if (tile.hasGroupKey() && group instanceof PreferenceCategory) {

                        if (group instanceof PreferenceCategory) {

                            ((PreferenceCategory) group).addPreference(pref);

                        } else {

                            screen.addPreference(pref);

                        }

                    } else {

                        screen.addPreference(pref);

                    }

                } else {

                    if (tile.hasGroupKey()

                            && mDashboardTilePrefKeys.containsKey(tile.getGroupKey())) {