Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid triggering BGE scaning multiple times" into main

Browse Source
This commit is contained in:
Vincent Wang
2025-02-14 02:17:21 -08:00
committed by Android (Google) Code Review
parent 6dda673bf0 8aa9b9a189
commit 3792641080
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -1067,8 +1067,11 @@ public class FingerprintSettings extends SubSettings {
mRemovalSidecar.setListener(mRemovalListener); mRemovalSidecar.setListener(mRemovalListener);
} }
mCalibrator = FeatureFactory.getFeatureFactory().getFingerprintFeatureProvider() if (!mLaunchedConfirm && !mIsEnrolling) {
.getUdfpsEnrollCalibrator(getActivity().getApplicationContext(), null, null); mCalibrator = FeatureFactory.getFeatureFactory().getFingerprintFeatureProvider()
.getUdfpsEnrollCalibrator(getActivity().getApplicationContext(), null,
null);
}
} }
private void updatePreferences() { private void updatePreferences() {
@@ -1517,6 +1520,11 @@ public class FingerprintSettings extends SubSettings {
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken); intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
intent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, mChallenge); intent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, mChallenge);
} }
if (mCalibrator != null) {
intent.putExtras(mCalibrator.getExtrasForNextIntent());
}
startActivityForResult(intent, AUTO_ADD_FIRST_FINGERPRINT_REQUEST); startActivityForResult(intent, AUTO_ADD_FIRST_FINGERPRINT_REQUEST);
} }