Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37926410 authored by Vincent Wang's avatar Vincent Wang Committed by Android (Google) Code Review
Browse files

Merge "Avoid triggering BGE scaning multiple times" into main

parents 6dda673b 8aa9b9a1

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+10 −2
Original line number Diff line number Diff line
@@ -1067,8 +1067,11 @@ public class FingerprintSettings extends SubSettings { 
                mRemovalSidecar.setListener(mRemovalListener);

            }



            if (!mLaunchedConfirm && !mIsEnrolling) {

                mCalibrator = FeatureFactory.getFeatureFactory().getFingerprintFeatureProvider()

                    .getUdfpsEnrollCalibrator(getActivity().getApplicationContext(), null, null);

                        .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);

        }