Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e155208 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Refine checkMaxEnrolled() for fingerprint" into tm-qpr-dev am: 311d818b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880528



Change-Id: I7641e7dddb2865e402d02b7e6dac7c7437825f82
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8a67244d 311d818b

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

+8 −1
Original line number Diff line number Diff line
@@ -248,6 +248,11 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { 
        return findViewById(R.id.error_text);

    }



    private boolean isFromSetupWizardSuggestAction(@Nullable Intent intent) {

        return intent != null && intent.getBooleanExtra(

                WizardManagerHelper.EXTRA_IS_SUW_SUGGESTED_ACTION_FLOW, false);

    }



    @Override

    protected int checkMaxEnrolled() {

        final boolean isSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
@@ -255,6 +260,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { 
                WizardManagerHelper.isDeferredSetupWizard(getIntent());

        final boolean isPortalSetupWizard =

                WizardManagerHelper.isPortalSetupWizard(getIntent());

        final boolean isFromSetupWizardSuggestAction = isFromSetupWizardSuggestAction(getIntent());

        if (mFingerprintManager != null) {

            final List<FingerprintSensorPropertiesInternal> props =

                    mFingerprintManager.getSensorPropertiesInternal();
@@ -266,7 +272,8 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { 
                    getApplicationContext()

                            .getResources()

                            .getInteger(R.integer.suw_max_fingerprints_enrollable);

            if (isSetupWizard && !isDeferredSetupWizard && !isPortalSetupWizard) {

            if (isSetupWizard && !isDeferredSetupWizard && !isPortalSetupWizard

                    && !isFromSetupWizardSuggestAction) {

                if (numEnrolledFingerprints >= maxFingerprintsEnrollableIfSUW) {

                    return R.string.fingerprint_intro_error_max;

                } else {