Merge "Add null pointer check to prevent crash" into main (fdc7d4af) · Commits · e / os / android_packages_apps_Settings

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()));