Merge "Use allowPrivateProfile to guard BiometricFragment changes" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
07b384fe25
@@ -143,7 +143,8 @@ public class BiometricFragment extends InstrumentedFragment {
|
|||||||
.setShowEmergencyCallButton(promptInfo.isShowEmergencyCallButton())
|
.setShowEmergencyCallButton(promptInfo.isShowEmergencyCallButton())
|
||||||
.setReceiveSystemEvents(true);
|
.setReceiveSystemEvents(true);
|
||||||
|
|
||||||
if (Flags.enableBiometricsToUnlockPrivateSpace()) {
|
if (android.os.Flags.allowPrivateProfile() && Flags.enablePrivateSpaceFeatures()
|
||||||
|
&& Flags.enableBiometricsToUnlockPrivateSpace()) {
|
||||||
promptBuilder = promptBuilder.setAllowBackgroundAuthentication(true /* allow */,
|
promptBuilder = promptBuilder.setAllowBackgroundAuthentication(true /* allow */,
|
||||||
promptInfo.shouldUseParentProfileForDeviceCredential());
|
promptInfo.shouldUseParentProfileForDeviceCredential());
|
||||||
} else {
|
} else {
|
||||||
|
Reference in New Issue
Block a user