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

Credential Manager Settings Improvement Bug fixes

Browse Source 
Bug: 372715083
Flag: Flag EXEMPT manual tests
Change-Id: I386bc590955d762af0370e7ff5d6fbece55b564d
This commit is contained in:
Joy Babafemi
2024-12-09 03:02:47 +00:00
parent 4d5fe47420
commit d3807e554d
16 changed files with 136 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,8 @@ import java.util.List;
import java.util.concurrent.Executor;
public class DefaultCombinedPreferenceController extends DefaultAppPreferenceController {
private final boolean mIsWorkProfile;
private final boolean mIsPrivateSpace;
private static final Intent AUTOFILL_PROBE = new Intent(AutofillService.SERVICE_INTERFACE);
private static final String TAG = "DefaultCombinedPreferenceController";
@@ -56,11 +57,14 @@ public class DefaultCombinedPreferenceController extends DefaultAppPreferenceCon
private final CredentialManager mCredentialManager;
private final Executor mExecutor;
public DefaultCombinedPreferenceController(Context context) {
public DefaultCombinedPreferenceController(Context context,
boolean isWorkProfile, boolean isPrivateSpace) {
super(context);
mExecutor = ContextCompat.getMainExecutor(context);
mAutofillManager = mContext.getSystemService(AutofillManager.class);
mIsWorkProfile = isWorkProfile;
mIsPrivateSpace = isPrivateSpace;
if (CredentialManager.isServiceEnabled(context)) {
mCredentialManager = mContext.getSystemService(CredentialManager.class);
@@ -209,14 +213,17 @@ public class DefaultCombinedPreferenceController extends DefaultAppPreferenceCon
}
protected int getUser() {
return UserHandle.myUserId();
return UserUtils.getUser(mIsWorkProfile, mIsPrivateSpace, mContext);
}
/** Creates an intent to open the credential picker. */
private Intent createIntentToOpenPicker() {
final Context context =
mContext.createContextAsUser(UserHandle.of(getUser()), /* flags= */ 0);
return new Intent(context, CredentialsPickerActivity.class);
Intent intent = new Intent(context, CredentialsPickerActivity.class);
intent.putExtra(UserUtils.EXTRA_IS_WORK_PROFILE, mIsWorkProfile);
intent.putExtra(UserUtils.EXTRA_IS_PRIVATE_SPACE, mIsPrivateSpace);
return intent;
}
private void removePrimaryProvider() {