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

Merge "Add try/catch to handle invalid settings activity" into main

Browse Source
This commit is contained in:
Becca Hughes
2024-01-26 18:58:30 +00:00
committed by Android (Google) Code Review
parent 68bc311bec 09fa333f47
commit 6e19c653a8
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/applications/credentials/CredentialManagerPreferenceController.java
View File

@@ -20,6 +20,7 @@ import static androidx.lifecycle.Lifecycle.Event.ON_CREATE;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.ActivityNotFoundException;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
@@ -656,7 +657,11 @@ public class CredentialManagerPreferenceController extends BasePreferenceControl
CombinedProviderInfo.createSettingsActivityIntent( CombinedProviderInfo.createSettingsActivityIntent(
mContext, packageName, settingsActivity, getUser()); mContext, packageName, settingsActivity, getUser());
if (settingsIntent != null) { if (settingsIntent != null) {
mContext.startActivity(settingsIntent); try {
mContext.startActivity(settingsIntent);
} catch (ActivityNotFoundException e) {
Log.e(TAG, "Failed to open settings activity", e);
}
} }
} }
}); });

8
src/com/android/settings/applications/credentials/DefaultCombinedPreferenceController.java
View File

@@ -16,6 +16,7 @@
package com.android.settings.applications.credentials; package com.android.settings.applications.credentials;
import android.content.ActivityNotFoundException;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.credentials.CredentialManager; import android.credentials.CredentialManager;
@@ -26,6 +27,7 @@ import android.provider.Settings;
import android.service.autofill.AutofillService; import android.service.autofill.AutofillService;
import android.service.autofill.AutofillServiceInfo; import android.service.autofill.AutofillServiceInfo;
import android.view.autofill.AutofillManager; import android.view.autofill.AutofillManager;
import android.util.Slog;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@@ -132,7 +134,11 @@ public class DefaultCombinedPreferenceController extends DefaultAppPreferenceCon
new PrimaryProviderPreference.Delegate() { new PrimaryProviderPreference.Delegate() {
public void onOpenButtonClicked() { public void onOpenButtonClicked() {
if (settingsActivityIntent != null) { if (settingsActivityIntent != null) {
startActivity(settingsActivityIntent); try {
startActivity(settingsActivityIntent);
} catch (ActivityNotFoundException e) {
Slog.e(TAG, "Failed to open settings activity", e);
}
} }
} }