From 1205ba58de555b44924065410abcd859ff924028 Mon Sep 17 00:00:00 2001 From: Milton Wu Date: Thu, 27 Apr 2023 10:39:25 +0000 Subject: [PATCH] [BiometricsV2] Fix fingerprint 2nd enroll fail Enrolling fragments wait cancelled msg then finish itself when user presses skip button in this page Bug: 279540275 Test: atest FingerprintEnrollmentActivityTest Test: For udfps and sfps devices, manually click "Add fingerprint" from Fingerprint Settings, then quickly back, and quickly re-enter. Make sure the re-entered enrolling works well. Change-Id: I99b67af31234f7332ad33e776e82d04ece117e5e --- .../ui/view/FingerprintEnrollEnrollingSfpsFragment.java | 6 ++++-- .../ui/view/FingerprintEnrollEnrollingUdfpsFragment.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.java b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.java index f2dad238b72..3551d555dfc 100644 --- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.java +++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingSfpsFragment.java @@ -104,8 +104,10 @@ public class FingerprintEnrollEnrollingSfpsFragment extends Fragment { private ObjectAnimator mHelpAnimation; private int mIconTouchCount; - private final View.OnClickListener mOnSkipClickListener = - (v) -> mEnrollingViewModel.onCancelledDueToOnSkipPressed(); + private final View.OnClickListener mOnSkipClickListener = v -> { + mEnrollingViewModel.setOnSkipPressed(); + cancelEnrollment(); + }; private final Observer mProgressObserver = progress -> { if (DEBUG) { diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.java b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.java index 40d571330d6..b5fe6094134 100644 --- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.java +++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.java @@ -95,8 +95,10 @@ public class FingerprintEnrollEnrollingUdfpsFragment extends Fragment { private int mRotation = -1; - private final View.OnClickListener mOnSkipClickListener = - (v) -> mEnrollingViewModel.onCancelledDueToOnSkipPressed(); + private final View.OnClickListener mOnSkipClickListener = v -> { + mEnrollingViewModel.setOnSkipPressed(); + cancelEnrollment(); + }; private final Observer mProgressObserver = progress -> { if (progress != null) {