Merge "Force Private Space to always use biometric prompt" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
4c0df13f28
@@ -377,7 +377,14 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
|
|||||||
setBiometricPromptPropertiesForPrivateProfile(promptInfo);
|
setBiometricPromptPropertiesForPrivateProfile(promptInfo);
|
||||||
showBiometricPrompt(promptInfo, effectiveUserId);
|
showBiometricPrompt(promptInfo, effectiveUserId);
|
||||||
launchedBiometric = true;
|
launchedBiometric = true;
|
||||||
|
} else if (Flags.privateSpaceBp()) {
|
||||||
|
promptInfo.setAuthenticators(BiometricManager.Authenticators.DEVICE_CREDENTIAL);
|
||||||
|
setBiometricPromptPropertiesForPrivateProfile(promptInfo);
|
||||||
|
showBiometricPrompt(promptInfo, mUserId);
|
||||||
|
launchedBiometric = true;
|
||||||
} else {
|
} else {
|
||||||
|
// TODO(b/376328272): Remove custom private space behavior
|
||||||
|
mDetails = Utils.getConfirmCredentialStringForUser(this, mUserId, credentialType);
|
||||||
showConfirmCredentials();
|
showConfirmCredentials();
|
||||||
launchedCDC = true;
|
launchedCDC = true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user