| commit | 2feaa3fa25fd2820ae50880009c107c1c35f4a40 | [log] [tgz] |
|---|---|---|
| author | MiltonWu <mingjuwu@google.com> | Wed Dec 13 10:16:47 2023 +0000 |
| committer | MiltonWu <mingjuwu@google.com> | Wed Dec 13 10:16:47 2023 +0000 |
| tree | f422452a00c60adb4caddc11499aedcbf4695454 | |
| parent | accd9ca2988201d1df8723cc98ef899ae3c7281e [diff] |
Refine calibrator usage Bug: 316103317 Test: Manually run the scenario Change-Id: If57396696b6a7d10e289ab0f2e7b14148034d34b
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java index b71330a..059173c 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -290,6 +290,17 @@ } @Override + protected Intent getFingerprintEnrollingIntent() { + final Intent ret = super.getFingerprintEnrollingIntent(); + if (Flags.udfpsEnrollCalibration()) { + if (mCalibrator != null) { + ret.putExtras(mCalibrator.getExtrasForNextIntent(true)); + } + } + return ret; + } + + @Override public void onBackPressed() { stopLookingForFingerprint(); super.onBackPressed();
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index bd52b64..aef3c06 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -385,7 +385,7 @@ } if (Flags.udfpsEnrollCalibration()) { if (mCalibrator != null) { - intent.putExtras(mCalibrator.getExtrasForNextIntent()); + intent.putExtras(mCalibrator.getExtrasForNextIntent(false)); } } return intent;
diff --git a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollCalibrator.kt b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollCalibrator.kt index 9809bcc..c54c6b5 100644 --- a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollCalibrator.kt +++ b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollCalibrator.kt
@@ -6,7 +6,7 @@ interface UdfpsEnrollCalibrator { - val extrasForNextIntent: Bundle + fun getExtrasForNextIntent(isEnrolling: Boolean): Bundle fun onSaveInstanceState(outState: Bundle)