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

Ensure fingerprint setup is shown once after face

Browse Source 
Adds an activity result extra during multi-biometric enroll that
ensures fingerprint setup will not be repeated multiple times if
explicitly finished or skipped by the user. Also updates various
activities in the stack to ensure that they handle all possible result
codes correctly and pass along result data.

Test: Manually skip and complete at each stage of multi-biometric enroll
Test: Manually test single-biometric enroll flows for SUW and Settings

Fixes: 193601823
Change-Id: Ic5a8306068eb4c32009f146ad6fff824fde25a11
This commit is contained in:
Curtis Belmonte
2021-07-15 16:04:47 -07:00
parent 20e57d33ff
commit b61478c30c
7 changed files with 111 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
View File

@@ -36,6 +36,7 @@ import com.android.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.SetupSkipDialog;
import com.google.android.setupcompat.template.FooterBarMixin;
import com.google.android.setupcompat.template.FooterButton;
@@ -284,13 +285,11 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST) {
if (resultCode == RESULT_SKIP || resultCode == RESULT_FINISHED) {
onSkipButtonClick(mFooterBarMixin.getSecondaryButtonView());
return;
if (isResultSkipOrFinished(resultCode)) {
handleBiometricResultSkipOrFinished(resultCode, data);
} else if (resultCode == RESULT_TIMEOUT) {
setResult(resultCode, data);
finish();
return;
}
} else if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST) {
mConfirmingCredentials = false;
@@ -337,8 +336,8 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
overridePendingTransition(R.anim.sud_slide_back_in, R.anim.sud_slide_back_out);
} else if (requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST) {
Log.d(TAG, "ENROLL_NEXT_BIOMETRIC_REQUEST, result: " + resultCode);
if (resultCode == RESULT_SKIP || resultCode == RESULT_FINISHED) {
onSkipButtonClick(mFooterBarMixin.getSecondaryButtonView());
if (isResultSkipOrFinished(resultCode)) {
handleBiometricResultSkipOrFinished(resultCode, data);
} else if (resultCode != RESULT_CANCELED) {
setResult(resultCode, data);
finish();
@@ -347,6 +346,25 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
super.onActivityResult(requestCode, resultCode, data);
}
private static boolean isResultSkipOrFinished(int resultCode) {
return resultCode == RESULT_SKIP || resultCode == SetupSkipDialog.RESULT_SKIP
|| resultCode == RESULT_FINISHED;
}
private void handleBiometricResultSkipOrFinished(int resultCode, @Nullable Intent data) {
if (data != null
&& data.getBooleanExtra(
MultiBiometricEnrollHelper.EXTRA_SKIP_PENDING_ENROLL, false)) {
getIntent().removeExtra(MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FACE);
}
if (resultCode == RESULT_SKIP) {
onEnrollmentSkipped(data);
} else if (resultCode == RESULT_FINISHED) {
onFinishedEnrolling(data);
}
}
/**
* Called after confirming credentials. Can be used to prevent the default
* behavior of immediately calling #getChallenge (useful to things like intro
@@ -364,7 +382,16 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
}
protected void onSkipButtonClick(View view) {
setResult(RESULT_SKIP);
onEnrollmentSkipped(null /* data */);
}
protected void onEnrollmentSkipped(@Nullable Intent data) {
setResult(RESULT_SKIP, data);
finish();
}
protected void onFinishedEnrolling(@Nullable Intent data) {
setResult(RESULT_FINISHED, data);
finish();
}