PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refine checkMaxEnrolled() for fingerprint" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-09-12 23:57:04 +00:00
committed by Android (Google) Code Review
parent e6fd2a5da8 9b998b7dac
commit 311d818b10
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -248,6 +248,11 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
return findViewById(R.id.error_text); 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 @Override
protected int checkMaxEnrolled() { protected int checkMaxEnrolled() {
final boolean isSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent()); final boolean isSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
@@ -255,6 +260,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
WizardManagerHelper.isDeferredSetupWizard(getIntent()); WizardManagerHelper.isDeferredSetupWizard(getIntent());
final boolean isPortalSetupWizard = final boolean isPortalSetupWizard =
WizardManagerHelper.isPortalSetupWizard(getIntent()); WizardManagerHelper.isPortalSetupWizard(getIntent());
final boolean isFromSetupWizardSuggestAction = isFromSetupWizardSuggestAction(getIntent());
if (mFingerprintManager != null) { if (mFingerprintManager != null) {
final List<FingerprintSensorPropertiesInternal> props = final List<FingerprintSensorPropertiesInternal> props =
mFingerprintManager.getSensorPropertiesInternal(); mFingerprintManager.getSensorPropertiesInternal();
@@ -266,7 +272,8 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
getApplicationContext() getApplicationContext()
.getResources() .getResources()
.getInteger(R.integer.suw_max_fingerprints_enrollable); .getInteger(R.integer.suw_max_fingerprints_enrollable);
if (isSetupWizard && !isDeferredSetupWizard && !isPortalSetupWizard) { if (isSetupWizard && !isDeferredSetupWizard && !isPortalSetupWizard
&& !isFromSetupWizardSuggestAction) {
if (numEnrolledFingerprints >= maxFingerprintsEnrollableIfSUW) { if (numEnrolledFingerprints >= maxFingerprintsEnrollableIfSUW) {
return R.string.fingerprint_intro_error_max; return R.string.fingerprint_intro_error_max;
} else { } else {