Merge "Do not request confirmation by default for private space unlocks" into main

src/com/android/settings/biometrics/face/FaceSettingsConfirmPreferenceController.java

@@ -26,6 +26,7 @@ import android.provider.Settings;
 
 import androidx.preference.Preference;
 
+import com.android.settings.R;
 import com.android.settings.Utils;
 
 import java.util.List;
@@ -76,6 +77,11 @@ public class FaceSettingsConfirmPreferenceController extends FaceSettingsPrefere
             preference.setEnabled(false);
         } else {
             preference.setEnabled(true);
+            // Update summary for private space face settings toggle
+            if (Utils.isPrivateProfile(getUserId(), mContext)) {
+                preference.setSummary(mContext.getString(
+                        R.string.private_space_face_settings_require_confirmation_details));
+            }
         }
     }
 

src/com/android/settings/password/ConfirmDeviceCredentialActivity.java

@@ -313,7 +313,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
             mForceVerifyPath = userProperties.isCredentialShareableWithParent();
             if (android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()
                     && isBiometricAllowed(effectiveUserId, mUserId)) {
-                promptInfo.setUseParentProfileForDeviceCredential(true);
+                setBiometricPromptPropertiesForPrivateProfile(promptInfo);
                 showBiometricPrompt(promptInfo, effectiveUserId);
                 launchedBiometric = true;
             } else {
@@ -344,6 +344,11 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
         }
     }
 
+    private static void setBiometricPromptPropertiesForPrivateProfile(PromptInfo promptInfo) {
+        promptInfo.setUseParentProfileForDeviceCredential(true);
+        promptInfo.setConfirmationRequested(false);
+    }
+
     private String getTitleFromCredentialType(@LockPatternUtils.CredentialType int credentialType,
             boolean isEffectiveUserManagedProfile) {
         switch (credentialType) {