From 7c235e3c0c2e39a15d9586fbad5124089c995c3f Mon Sep 17 00:00:00 2001
From: Austin Delgado <austindelgado@google.com>
Date: Thu, 26 Sep 2024 10:31:21 -0700
Subject: [PATCH] Force Private Space to always use biometric prompt

Bug: 365094949
Bug: 365932447
Bug: 366441553
Test: Verified manually
Flag: android.hardware.biometrics.private_space_bp

Change-Id: I78cb53e6e38c73d7819f7368546f53bc7026f9b5
---
 .../settings/password/ConfirmDeviceCredentialActivity.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index d656934a26b..302cf1fcdf0 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -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;
             }