diff --git a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
index 8634441e9bb..c62feddc208 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
@@ -126,7 +126,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
     public abstract void onClick(LinkSpan span);
 
     protected interface GenerateChallengeCallback {
-        void onChallengeGenerated(long challenge);
+        void onChallengeGenerated(int sensorId, long challenge);
     }
 
     @Override
@@ -276,7 +276,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
                 updatePasswordQuality();
                 overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
                 getNextButton().setEnabled(false);
-                getChallenge((challenge -> {
+                getChallenge(((sensorId, challenge) -> {
                     mToken = BiometricUtils.requestGatekeeperHat(this, data, mUserId, challenge);
                     getNextButton().setEnabled(true);
                 }));
@@ -289,7 +289,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
             if (resultCode == RESULT_OK && data != null) {
                 overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
                 getNextButton().setEnabled(false);
-                getChallenge((challenge -> {
+                getChallenge(((sensorId, challenge) -> {
                     mToken = BiometricUtils.requestGatekeeperHat(this, data, mUserId, challenge);
                     getNextButton().setEnabled(true);
                 }));
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index 3db51fec4c7..3c5f2194919 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -103,7 +103,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
             mFooterBarMixin.getPrimaryButton().setEnabled(false);
             // We either block on generateChallenge, or need to gray out the "next" button until
             // the challenge is ready. Let's just do this for now.
-            mFaceManager.generateChallenge(challenge -> {
+            mFaceManager.generateChallenge((sensorId, challenge) -> {
                 mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge);
                 mFooterBarMixin.getPrimaryButton().setEnabled(true);
             });
@@ -185,7 +185,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
     protected void getChallenge(GenerateChallengeCallback callback) {
         mFaceManager = Utils.getFaceManagerOrNull(this);
         if (mFaceManager == null) {
-            callback.onChallengeGenerated(0L);
+            callback.onChallengeGenerated(0, 0L);
             return;
         }
         mFaceManager.generateChallenge(callback::onChallengeGenerated);
diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index 976c6e3237d..051efc25786 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -244,7 +244,7 @@ public class FaceSettings extends DashboardFragment {
         if (requestCode == CONFIRM_REQUEST) {
             if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
                 // The pin/pattern/password was set.
-                mFaceManager.generateChallenge(challenge -> {
+                mFaceManager.generateChallenge((sensorId, challenge) -> {
                     mToken = BiometricUtils.requestGatekeeperHat(getPrefContext(), data, mUserId,
                             challenge);
                     mAttentionController.setToken(mToken);
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 8795f7f6f5b..f1c3ab58a8a 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -65,7 +65,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase {
         // adb shell am start -a android.app.action.SET_NEW_PASSWORD
         if (mToken == null && BiometricUtils.containsGatekeeperPassword(getIntent())) {
             final FingerprintManager fpm = getSystemService(FingerprintManager.class);
-            fpm.generateChallenge(challenge -> {
+            fpm.generateChallenge((sensorId, challenge) -> {
                 mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge);
 
                 // Put this into the intent. This is really just to work around the fact that the
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index 0b5c7b0ff77..78bb9788b91 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -134,7 +134,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
     protected void getChallenge(GenerateChallengeCallback callback) {
         mFingerprintManager = Utils.getFingerprintManagerOrNull(this);
         if (mFingerprintManager == null) {
-            callback.onChallengeGenerated(0L);
+            callback.onChallengeGenerated(0, 0L);
             return;
         }
         mFingerprintManager.generateChallenge(callback::onChallengeGenerated);
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index a2d67f41d86..351b5aaf0b5 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -571,7 +571,7 @@ public class FingerprintSettings extends SubSettings {
                 mLaunchedConfirm = false;
                 if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
                     if (data != null && BiometricUtils.containsGatekeeperPassword(data)) {
-                        mFingerprintManager.generateChallenge(challenge -> {
+                        mFingerprintManager.generateChallenge((sensorId, challenge) -> {
                             mToken = BiometricUtils.requestGatekeeperHat(getActivity(), data,
                                     mUserId, challenge);
                             updateAddPreference();