From e24255fe7e395d73af3f868785a4afc9ba246feb Mon Sep 17 00:00:00 2001 From: Mill Chen Date: Thu, 1 Jul 2021 14:17:52 +0800 Subject: [PATCH] Fix multiple biometrics enrollment flow Suppose both face auth and fingerprint auth exist in a device, the setup flow will skip fingerprint enrollment when a user skips to register face data on the face enrollment education page. Updated the skip button method and make the flow move on to fingerprint enrollment if a use doesn't want to register face data. Fix: 186084024 Test: manual verified 1) Reset device and start from SUW 2) Press skip button on the face unlock education page 3) The next flow should be fingerprint enrollment intro page Change-Id: I037ae68f39f5fdbf62ea95b998621c7f7df31b43 --- .../settings/biometrics/face/FaceEnrollEducation.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java index 65ab2e7c783..f915059407c 100644 --- 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