Merge "Fix extra password confirm prompts during managed setup." into sc-dev

2021-08-07 00:07:22 +00:00
parent 68ac2d69c0 c11e01f39d
commit 336d3e5501
3 changed files with 140 additions and 1 deletions
--- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -284,7 +284,7 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
            launchCredentialOnlyEnroll();
            finish();
        } else if (canUseFace && canUseFingerprint) {
-            if (mParentalOptionsRequired && mGkPwHandle != null) {
+            if (mGkPwHandle != null) {
                launchFaceAndFingerprintEnroll();
            } else {
                setOrConfirmCredentialsNow();