Merge "Avoid potential ActivityNotFoundException" into main

This commit is contained in:
Jacky Wang
2024-09-25 06:27:26 +00:00
committed by Android (Google) Code Review

View File

@@ -249,6 +249,15 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
@Override @Override
public boolean onPreferenceTreeClick(Preference preference) { public boolean onPreferenceTreeClick(Preference preference) {
if (isCatalystEnabled()) {
Intent intent = preference.getIntent();
if (intent != null && preference.getContext().getPackageManager().queryIntentActivities(
intent, 0).isEmpty()) {
Log.w(TAG, "No activity to start for " + intent);
return true;
}
}
final Collection<List<AbstractPreferenceController>> controllers = final Collection<List<AbstractPreferenceController>> controllers =
mPreferenceControllers.values(); mPreferenceControllers.values();
for (List<AbstractPreferenceController> controllerList : controllers) { for (List<AbstractPreferenceController> controllerList : controllers) {