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

Don't also skip fingerprint in SUW when skipping face

Browse Source 
Ensures that each biometric enroll intro activity handles an activity
result of RESULT_SKIP by calling the appropriate skip handler, rather
than just finishing. This fixes an issue where skipping face setup from
some Setup Wizard states would skip fingerprint setup as well.

Test: Manually skipped face setup from each screen during SUW

Bug: 193367620
Change-Id: If9ef9f19f8e967093f17dde98093a506400d7c09
This commit is contained in:
Curtis Belmonte
2021-07-14 15:44:49 -07:00
parent bef076df47
commit 1b69dece94
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -284,8 +284,10 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST) { if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST) {
if (resultCode == RESULT_FINISHED || resultCode == RESULT_SKIP if (resultCode == RESULT_SKIP || resultCode == RESULT_FINISHED) {
|| resultCode == RESULT_TIMEOUT) { onSkipButtonClick(mFooterBarMixin.getSecondaryButtonView());
return;
} else if (resultCode == RESULT_TIMEOUT) {
setResult(resultCode, data); setResult(resultCode, data);
finish(); finish();
return; return;
@@ -335,7 +337,9 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
overridePendingTransition(R.anim.sud_slide_back_in, R.anim.sud_slide_back_out); overridePendingTransition(R.anim.sud_slide_back_in, R.anim.sud_slide_back_out);
} else if (requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST) { } else if (requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST) {
Log.d(TAG, "ENROLL_NEXT_BIOMETRIC_REQUEST, result: " + resultCode); Log.d(TAG, "ENROLL_NEXT_BIOMETRIC_REQUEST, result: " + resultCode);
if (resultCode != RESULT_CANCELED) { if (resultCode == RESULT_SKIP || resultCode == RESULT_FINISHED) {
onSkipButtonClick(mFooterBarMixin.getSecondaryButtonView());
} else if (resultCode != RESULT_CANCELED) {
setResult(resultCode, data); setResult(resultCode, data);
finish(); finish();
} }