diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index 8ce38453ceb..71d0c8eceba 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java @@ -241,6 +241,8 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { final boolean isSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent()); final boolean isDeferredSetupWizard = WizardManagerHelper.isDeferredSetupWizard(getIntent()); + final boolean isPortalSetupWizard = + WizardManagerHelper.isPortalSetupWizard(getIntent()); if (mFingerprintManager != null) { final List props = mFingerprintManager.getSensorPropertiesInternal(); @@ -252,7 +254,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { getApplicationContext() .getResources() .getInteger(R.integer.suw_max_fingerprints_enrollable); - if (isSetupWizard && !isDeferredSetupWizard) { + if (isSetupWizard && !isDeferredSetupWizard && !isPortalSetupWizard) { if (numEnrolledFingerprints >= maxFingerprintsEnrollableIfSUW) { return R.string.fingerprint_intro_error_max; } else { diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java index d8852dbb739..1096f4085a4 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java @@ -173,4 +173,24 @@ public class FingerprintEnrollIntroductionTest { assertThat(result).isEqualTo(R.string.fingerprint_intro_error_max); } + + @Test + public void intro_CheckCanEnrollDuringPortal() { + setupFingerprintEnrollIntroWith( + new Intent().putExtra(WizardManagerHelper.EXTRA_IS_PORTAL_SETUP, true)); + setFingerprintManagerToHave(2 /* numEnrollments */); + int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); + + assertThat(result).isEqualTo(0); + } + + @Test + public void intro_CheckMaxEnrolledDuringPortal() { + setupFingerprintEnrollIntroWith( + new Intent().putExtra(WizardManagerHelper.EXTRA_IS_PORTAL_SETUP, true)); + setFingerprintManagerToHave(6 /* numEnrollments */); + int result = mFingerprintEnrollIntroduction.checkMaxEnrolled(); + + assertThat(result).isEqualTo(R.string.fingerprint_intro_error_max); + } }