Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5 am: 3b9e5510d4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945 Change-Id: I455deb9fa42d17862ad6b8b943cee62049cbb68d
2021-07-02 05:51:33 +00:00
parent 5f4aeb6287 3b9e5510d4
commit 5864029f82
1 changed files with 4 additions and 2 deletions
--- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
@@ -215,8 +215,10 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
    }

    protected void onSkipButtonClick(View view) {
-        setResult(RESULT_SKIP);
-        finish();
+        if (!BiometricUtils.tryStartingNextBiometricEnroll(this, ENROLL_NEXT_BIOMETRIC_REQUEST)) {
+            setResult(RESULT_SKIP);
+            finish();
+        }
    }

    @Override