Fix extra password confirm prompts during managed setup.

Managed accounts may set the pin/pattern before enrollment begins.

Fix: 191608999
Test: atest BiometricEnrollActivityTest
Change-Id: I4065989ecc26ce72ffd0e06e7c6e68029a11908f
This commit is contained in:
Joe Bolinger
2021-08-04 17:19:20 -07:00
parent fdb80de825
commit c11e01f39d
3 changed files with 140 additions and 1 deletions

View File

@@ -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();