Merge "Return an empty SensorProps array instead of null in" into main

1 files changed, 4 insertions, 0 deletions

diff --git a/core/java/android/hardware/fingerprint/FingerprintSensorConfigurations.java b/core/java/android/hardware/fingerprint/FingerprintSensorConfigurations.java
index 48c5887d80d0..586830c8d189 100644
--- a/core/java/android/hardware/fingerprint/FingerprintSensorConfigurations.java
+++ b/core/java/android/hardware/fingerprint/FingerprintSensorConfigurations.java
@@ -224,6 +224,10 @@ public class FingerprintSensorConfigurations implements Parcelable {
         } catch (RemoteException e) {
             Log.d(TAG, "Unable to get sensor properties!");
         }
+
+        if (props == null) {
+            props = new SensorProps[]{};
+        }
         return props;
     }
 }