PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dynamic Injection into PreferenceCategory

Browse Source 
- Avoid NPE when groupkey is null

Bug: 335592049
Change-Id: I810220d18e55351a280cff08b74b37130607168c
Test: robotest & manual
This commit is contained in:
Edgar Wang
2024-04-19 00:18:11 +00:00
parent ea89a3cb1d
commit aec1d97788
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/dashboard/DashboardFragment.java
View File

@@ -545,9 +545,13 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
getActivity(), this, forceRoundedIcons, pref, tile, key, getActivity(), this, forceRoundedIcons, pref, tile, key,
mPlaceholderPreferenceController.getOrder()); mPlaceholderPreferenceController.getOrder());
if (Flags.dynamicInjectionCategory()) { if (Flags.dynamicInjectionCategory()) {
Preference group = screen.findPreference(tile.getGroupKey()); if (tile.hasGroupKey()) {
if (tile.hasGroupKey() && group instanceof PreferenceCategory) { Preference group = screen.findPreference(tile.getGroupKey());
((PreferenceCategory) group).addPreference(pref); if (group instanceof PreferenceCategory) {
((PreferenceCategory) group).addPreference(pref);
} else {
screen.addPreference(pref);
}
} else { } else {
screen.addPreference(pref); screen.addPreference(pref);
} }