Merge "Check portal on fingerprint intro page" into tm-qpr-dev (9fcf073b) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -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<FingerprintSensorPropertiesInternal> 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 {

+20 −0

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}