diff --git a/services/core/Android.bp b/services/core/Android.bp
index f135fbfd9f8d5..752ab97240bd3 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -157,7 +157,7 @@ java_library_static {
         "android.hardware.weaver-V1.0-java",
         "android.hardware.biometrics.face-V1.0-java",
         "android.hardware.biometrics.fingerprint-V2.3-java",
-        "android.hardware.biometrics.fingerprint-V1-java",
+        "android.hardware.biometrics.fingerprint-V2-java",
         "android.hardware.oemlock-V1.0-java",
         "android.hardware.configstore-V1.1-java",
         "android.hardware.contexthub-V1.0-java",
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
index 0defc3fb6a50f..734b1737dfbcb 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java
@@ -72,8 +72,10 @@ import org.json.JSONObject;
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
 
 /**
  * Provider for a single instance of the {@link IFingerprint} HAL.
@@ -169,11 +171,13 @@ public class FingerprintProvider implements IBinder.DeathRecipient, ServiceProvi
                             prop.sensorType,
                             true /* resetLockoutRequiresHardwareAuthToken */,
                             !workaroundLocations.isEmpty() ? workaroundLocations :
-                                    List.of(new SensorLocationInternal(
-                                        "" /* displayId */,
-                                        prop.sensorLocations[0].sensorLocationX,
-                                        prop.sensorLocations[0].sensorLocationY,
-                                        prop.sensorLocations[0].sensorRadius)));
+                                    Arrays.stream(prop.sensorLocations).map(location ->
+                                            new SensorLocationInternal(
+                                                    location.display,
+                                                    location.sensorLocationX,
+                                                    location.sensorLocationY,
+                                                    location.sensorRadius))
+                                            .collect(Collectors.toList()));
             final Sensor sensor = new Sensor(getTag() + "/" + sensorId, this, mContext, mHandler,
                     internalProp, lockoutResetDispatcher, gestureAvailabilityDispatcher);