Merge "Refine calibrator usage" into main

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

@@ -289,6 +289,17 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
         }
     }
 
+    @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();

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

@@ -385,7 +385,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
         }
         if (Flags.udfpsEnrollCalibration()) {
             if (mCalibrator != null) {
-                intent.putExtras(mCalibrator.getExtrasForNextIntent());
+                intent.putExtras(mCalibrator.getExtrasForNextIntent(false));
             }
         }
         return intent;

src/com/android/settings/biometrics/fingerprint/UdfpsEnrollCalibrator.kt

@@ -6,7 +6,7 @@ import androidx.lifecycle.Lifecycle
 
 interface UdfpsEnrollCalibrator {
 
-    val extrasForNextIntent: Bundle
+    fun getExtrasForNextIntent(isEnrolling: Boolean): Bundle
 
     fun onSaveInstanceState(outState: Bundle)