From 8aa9b9a189aa16e125ace889e6b5d8e4a910537c Mon Sep 17 00:00:00 2001 From: Vincent Wang Date: Fri, 14 Feb 2025 03:57:19 +0000 Subject: [PATCH] Avoid triggering BGE scaning multiple times BUG: b/391255128 Flag: EXEMPT bug fixing Test: Manual test and check BGE scanning behavior Change-Id: I7d8649360a09f8eb48b990f5ae33ee6cd1723445 --- .../biometrics/fingerprint/FingerprintSettings.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java index 6773fdcf1ce..31ebeb7c705 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java @@ -1067,8 +1067,11 @@ public class FingerprintSettings extends SubSettings { mRemovalSidecar.setListener(mRemovalListener); } - mCalibrator = FeatureFactory.getFeatureFactory().getFingerprintFeatureProvider() - .getUdfpsEnrollCalibrator(getActivity().getApplicationContext(), null, null); + if (!mLaunchedConfirm && !mIsEnrolling) { + mCalibrator = FeatureFactory.getFeatureFactory().getFingerprintFeatureProvider() + .getUdfpsEnrollCalibrator(getActivity().getApplicationContext(), null, + null); + } } private void updatePreferences() { @@ -1517,6 +1520,11 @@ public class FingerprintSettings extends SubSettings { intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken); intent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, mChallenge); } + + if (mCalibrator != null) { + intent.putExtras(mCalibrator.getExtrasForNextIntent()); + } + startActivityForResult(intent, AUTO_ADD_FIRST_FINGERPRINT_REQUEST); }