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

Merge "Don't also skip fingerprint in SUW when skipping face" into sc-dev am: b1ba3c57af

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

Change-Id: I5479fb581552a70fbdd10d6efc744128c159cf16
This commit is contained in:
TreeHugger Robot
2021-07-15 19:43:44 +00:00
committed by Automerger Merge Worker
parent 47837d28c1 b1ba3c57af
commit 205a6088a8
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();
} }