From aec1d97788d552242e42a276b94cd533f2610ec3 Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Fri, 19 Apr 2024 00:18:11 +0000
Subject: [PATCH] Dynamic Injection into PreferenceCategory

- Avoid NPE when groupkey is null

Bug: 335592049
Change-Id: I810220d18e55351a280cff08b74b37130607168c
Test: robotest & manual
---
 .../android/settings/dashboard/DashboardFragment.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index 6df80f1c2ac..9abc6c2a0fa 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -545,9 +545,13 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
                         getActivity(), this, forceRoundedIcons, pref, tile, key,
                         mPlaceholderPreferenceController.getOrder());
                 if (Flags.dynamicInjectionCategory()) {
-                    Preference group = screen.findPreference(tile.getGroupKey());
-                    if (tile.hasGroupKey() && group instanceof PreferenceCategory) {
-                        ((PreferenceCategory) group).addPreference(pref);
+                    if (tile.hasGroupKey()) {
+                        Preference group = screen.findPreference(tile.getGroupKey());
+                        if (group instanceof PreferenceCategory) {
+                            ((PreferenceCategory) group).addPreference(pref);
+                        } else {
+                            screen.addPreference(pref);
+                        }
                     } else {
                         screen.addPreference(pref);
                     }