From 955c8349ed678379f63c85581a5134385a5a177e Mon Sep 17 00:00:00 2001
From: Joe Bolinger <jbolinger@google.com>
Date: Thu, 6 May 2021 21:41:43 -0700
Subject: [PATCH] Prevent multi-sensor enrollment from doing nothing.

Fix: 186499864
Test: manual (setup with managed account)
Change-Id: If2b2623b2e348ef9d335c81189dbe23e4fe5f003
---
 .../android/settings/biometrics/BiometricEnrollActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
index eede22ac868..0cf82897a47 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -271,7 +271,7 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
         mIsFingerprintEnrollable = fingerprintManager.getEnrolledFingerprints(mUserId).size()
                 < fpProperties.get(0).maxEnrollmentsPerUser;
 
-        if (!mConfirmingCredentials && mGkPwHandle == null) {
+        if (!mConfirmingCredentials) {
             mConfirmingCredentials = true;
             if (!userHasPassword(mUserId)) {
                 launchChooseLock();