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

Refine checkMaxEnrolled() for fingerprint

Browse Source 
FingerprintEnrollIntroduction shall allow setting 2nd fingerprint if
this intent is coming from "Anything else" page in SUW.

Bug: 228418807
Test: Manually test fingerprint in SUW
Test: ROBOTEST FingerprintEnrollIntroduction and
      SetupFingerprintEnrollIntroduction
Change-Id: I62edeb91f90b32f62b3ca2b2ea04ec427b31d483
This commit is contained in:
Milton Wu
2022-09-06 15:39:53 +00:00
parent 17122f9617
commit 9b998b7dac
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);
}
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 {