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

Commit 4959e0fb authored by Chun-Ku Lin's avatar Chun-Ku Lin
Browse files

Add null pointer check to prevent crash 

Bug: 338082036
Test: atest EditShortcutsPreferenceFragmentTest
Flag: EXEMPT bugfix low risk
Change-Id: I70f00eb2912e4ddd6efbd298ae6b6885f28160de
parent 94291dfd

src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java

+5 −3
Original line number Diff line number Diff line
@@ -182,9 +182,11 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment { 
                    refreshPreferenceController(QuickSettingsShortcutOptionController.class);

                }



                if (getContext() != null) {

                    PreferredShortcuts.updatePreferredShortcutsFromSettings(

                            getContext(), mShortcutTargets);

                }

            }

        };



        registerSettingsObserver();
@@ -388,7 +390,7 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment { 
    private void refreshPreferenceController(

            Class<? extends AbstractPreferenceController> controllerClass) {

        AbstractPreferenceController controller = use(controllerClass);

        if (controller != null) {

        if (controller != null && getPreferenceScreen() != null) {

            controller.displayPreference(getPreferenceScreen());

            if (!TextUtils.isEmpty(controller.getPreferenceKey())) {

                controller.updateState(findPreference(controller.getPreferenceKey()));