Merge "Force Private Space to always use biometric prompt" into main

This commit is contained in:
Austin Delgado
2024-10-30 21:03:08 +00:00
committed by Android (Google) Code Review

View File

@@ -377,7 +377,14 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
setBiometricPromptPropertiesForPrivateProfile(promptInfo);
showBiometricPrompt(promptInfo, effectiveUserId);
launchedBiometric = true;
} else if (Flags.privateSpaceBp()) {
promptInfo.setAuthenticators(BiometricManager.Authenticators.DEVICE_CREDENTIAL);
setBiometricPromptPropertiesForPrivateProfile(promptInfo);
showBiometricPrompt(promptInfo, mUserId);
launchedBiometric = true;
} else {
// TODO(b/376328272): Remove custom private space behavior
mDetails = Utils.getConfirmCredentialStringForUser(this, mUserId, credentialType);
showConfirmCredentials();
launchedCDC = true;
}