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

Merge "Add null pointer check to prevent crash" into main

Browse Source
This commit is contained in:
Chun-Ku Lin
2024-05-07 19:09:38 +00:00
committed by Android (Google) Code Review
parent 3e4247ad9a 4959e0fba0
commit fdc7d4afa9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/accessibility/shortcuts/EditShortcutsPreferenceFragment.java
View File

@@ -182,9 +182,11 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment {
refreshPreferenceController(QuickSettingsShortcutOptionController.class); refreshPreferenceController(QuickSettingsShortcutOptionController.class);
} }
if (getContext() != null) {
PreferredShortcuts.updatePreferredShortcutsFromSettings( PreferredShortcuts.updatePreferredShortcutsFromSettings(
getContext(), mShortcutTargets); getContext(), mShortcutTargets);
} }
}
}; };
registerSettingsObserver(); registerSettingsObserver();
@@ -388,7 +390,7 @@ public class EditShortcutsPreferenceFragment extends DashboardFragment {
private void refreshPreferenceController( private void refreshPreferenceController(
Class<? extends AbstractPreferenceController> controllerClass) { Class<? extends AbstractPreferenceController> controllerClass) {
AbstractPreferenceController controller = use(controllerClass); AbstractPreferenceController controller = use(controllerClass);
if (controller != null) { if (controller != null && getPreferenceScreen() != null) {
controller.displayPreference(getPreferenceScreen()); controller.displayPreference(getPreferenceScreen());
if (!TextUtils.isEmpty(controller.getPreferenceKey())) { if (!TextUtils.isEmpty(controller.getPreferenceKey())) {
controller.updateState(findPreference(controller.getPreferenceKey())); controller.updateState(findPreference(controller.getPreferenceKey()));