PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Launch multiple biometric enrollment when no biometric is enrolled"

Browse Source 
This reverts commit c4ee2b83e5.

Reason for revert: b/404133188
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cb181c50b5b0a04f7aec81aaa96657ca5c22c611)
Merged-In: I523ab1cc638ac9782a6b60a7f640f620bb3aae22
Change-Id: I523ab1cc638ac9782a6b60a7f640f620bb3aae22
This commit is contained in:
Bill Lin
2025-03-18 00:20:36 -07:00
committed by Android Build Coastguard Worker
parent 11e141b804
commit 2e8d1fa67c
5 changed files with 5 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/safetycenter/FaceSafetySource.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.safetycenter;
import static com.android.settings.biometrics.BiometricEnrollActivity.EXTRA_LAUNCH_FACE_ENROLL_FIRST;
import static com.android.settings.safetycenter.BiometricSourcesUtils.REQUEST_CODE_FACE_SETTING;
import android.content.Context;
@@ -28,7 +27,6 @@ import android.os.UserManager;
import android.safetycenter.SafetyEvent;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollActivity;
import com.android.settings.biometrics.BiometricNavigationUtils;
import com.android.settings.biometrics.face.FaceStatusUtils;
import com.android.settings.flags.Flags;
@@ -75,16 +73,6 @@ public final class FaceSafetySource {
Context profileParentContext = context.createContextAsUser(profileParentUserHandle, 0);
if (Utils.hasFaceHardware(context)) {
boolean isMultipleBiometricsEnrollmentNeeded =
BiometricSourcesUtils.isMultipleBiometricsEnrollmentNeeded(context, userId);
String settingClassName = isMultipleBiometricsEnrollmentNeeded
? BiometricEnrollActivity.class.getName()
: faceStatusUtils.getSettingsClassName();
Bundle bundle = new Bundle();
if (isMultipleBiometricsEnrollmentNeeded) {
// Launch face enrollment first then fingerprint enrollment.
bundle.putBoolean(EXTRA_LAUNCH_FACE_ENROLL_FIRST, true);
}
RestrictedLockUtils.EnforcedAdmin disablingAdmin = faceStatusUtils.getDisablingAdmin();
BiometricSourcesUtils.setBiometricSafetySourceData(
SAFETY_SOURCE_ID,
@@ -96,9 +84,9 @@ public final class FaceSafetySource {
biometricNavigationUtils
.getBiometricSettingsIntent(
context,
settingClassName,
faceStatusUtils.getSettingsClassName(),
disablingAdmin,
bundle)
Bundle.EMPTY)
.setIdentifier(Integer.toString(userId)),
REQUEST_CODE_FACE_SETTING),
disablingAdmin == null /* enabled */,