Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix enterprise settings bug" into main

Browse Source
This commit is contained in:
Becca Hughes
2024-02-06 22:35:07 +00:00
committed by Android (Google) Code Review
parent ac869a57ad 401ebcb53d
commit 3aa7212b26
9 changed files with 206 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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