Merge "Add nullability annotations and imports" into sc-dev

8 files changed, 23 insertions, 18 deletions

diff --git a/core/java/android/hardware/biometrics/ComponentInfoInternal.java b/core/java/android/hardware/biometrics/ComponentInfoInternal.java
index fa34e0b4f0f2..3b61a56bd9f1 100644
--- a/core/java/android/hardware/biometrics/ComponentInfoInternal.java
+++ b/core/java/android/hardware/biometrics/ComponentInfoInternal.java
@@ -27,11 +27,11 @@ import android.os.Parcelable;
  */
 public class ComponentInfoInternal implements Parcelable {
 
-    public final String componentId;
-    public final String hardwareVersion;
-    public final String firmwareVersion;
-    public final String serialNumber;
-    public final String softwareVersion;
+    @NonNull public final String componentId;
+    @NonNull public final String hardwareVersion;
+    @NonNull public final String firmwareVersion;
+    @NonNull public final String serialNumber;
+    @NonNull public final String softwareVersion;
 
     /**
      * Constructs a {@link ComponentInfoInternal} from another instance.
@@ -45,8 +45,9 @@ public class ComponentInfoInternal implements Parcelable {
     /**
      * @hide
      */
-    public ComponentInfoInternal(String componentId, String hardwareVersion,
-            String firmwareVersion, String serialNumber, String softwareVersion) {
+    public ComponentInfoInternal(@NonNull String componentId, @NonNull String hardwareVersion,
+            @NonNull String firmwareVersion, @NonNull String serialNumber,
+            @NonNull String softwareVersion) {
         this.componentId = componentId;
         this.hardwareVersion = hardwareVersion;
         this.firmwareVersion = firmwareVersion;
diff --git a/core/java/android/hardware/biometrics/SensorPropertiesInternal.java b/core/java/android/hardware/biometrics/SensorPropertiesInternal.java
index eda0ded42cdd..17b2abf9f5d1 100644
--- a/core/java/android/hardware/biometrics/SensorPropertiesInternal.java
+++ b/core/java/android/hardware/biometrics/SensorPropertiesInternal.java
@@ -34,7 +34,7 @@ public class SensorPropertiesInternal implements Parcelable {
     public final int sensorId;
     @SensorProperties.Strength public final int sensorStrength;
     public final int maxEnrollmentsPerUser;
-    public final List<ComponentInfoInternal> componentInfo;
+    @NonNull public final List<ComponentInfoInternal> componentInfo;
     public final boolean resetLockoutRequiresHardwareAuthToken;
     public final boolean resetLockoutRequiresChallenge;
 
diff --git a/core/java/android/hardware/face/FaceSensorProperties.java b/core/java/android/hardware/face/FaceSensorProperties.java
index 6ddea5017088..f61312785919 100644
--- a/core/java/android/hardware/face/FaceSensorProperties.java
+++ b/core/java/android/hardware/face/FaceSensorProperties.java
@@ -17,6 +17,7 @@
 package android.hardware.face;
 
 import android.annotation.IntDef;
+import android.annotation.NonNull;
 import android.hardware.biometrics.ComponentInfoInternal;
 import android.hardware.biometrics.SensorProperties;
 
@@ -74,7 +75,8 @@ public class FaceSensorProperties extends SensorProperties {
      * @hide
      */
     public FaceSensorProperties(int sensorId, int sensorStrength,
-            List<ComponentInfo> componentInfo, @FaceSensorProperties.SensorType int sensorType) {
+            @NonNull List<ComponentInfo> componentInfo,
+            @FaceSensorProperties.SensorType int sensorType) {
         super(sensorId, sensorStrength, componentInfo);
         mSensorType = sensorType;
     }
diff --git a/core/java/android/hardware/face/FaceSensorPropertiesInternal.java b/core/java/android/hardware/face/FaceSensorPropertiesInternal.java
index 50ea60a2ff57..44dffb207731 100644
--- a/core/java/android/hardware/face/FaceSensorPropertiesInternal.java
+++ b/core/java/android/hardware/face/FaceSensorPropertiesInternal.java
@@ -16,6 +16,7 @@
 
 package android.hardware.face;
 
+import android.annotation.NonNull;
 import android.hardware.biometrics.ComponentInfoInternal;
 import android.hardware.biometrics.SensorProperties;
 import android.hardware.biometrics.SensorPropertiesInternal;
@@ -48,7 +49,7 @@ public class FaceSensorPropertiesInternal extends SensorPropertiesInternal {
      * Initializes SensorProperties with specified values
      */
     public FaceSensorPropertiesInternal(int sensorId, @SensorProperties.Strength int strength,
-            int maxEnrollmentsPerUser, List<ComponentInfoInternal> componentInfo,
+            int maxEnrollmentsPerUser, @NonNull List<ComponentInfoInternal> componentInfo,
             @FaceSensorProperties.SensorType int sensorType, boolean supportsFaceDetection,
             boolean supportsSelfIllumination, boolean resetLockoutRequiresChallenge) {
         // resetLockout is managed by the HAL and requires a HardwareAuthToken for all face
diff --git a/core/java/android/hardware/fingerprint/FingerprintSensorProperties.java b/core/java/android/hardware/fingerprint/FingerprintSensorProperties.java
index a3385752aaf3..71b705faba79 100644
--- a/core/java/android/hardware/fingerprint/FingerprintSensorProperties.java
+++ b/core/java/android/hardware/fingerprint/FingerprintSensorProperties.java
@@ -17,6 +17,7 @@
 package android.hardware.fingerprint;
 
 import android.annotation.IntDef;
+import android.annotation.NonNull;
 import android.hardware.biometrics.ComponentInfoInternal;
 import android.hardware.biometrics.SensorProperties;
 
@@ -94,7 +95,7 @@ public class FingerprintSensorProperties extends SensorProperties {
      * @hide
      */
     public FingerprintSensorProperties(int sensorId, int sensorStrength,
-            List<ComponentInfo> componentInfo, @SensorType int sensorType) {
+            @NonNull List<ComponentInfo> componentInfo, @SensorType int sensorType) {
         super(sensorId, sensorStrength, componentInfo);
         mSensorType = sensorType;
     }
diff --git a/core/java/android/hardware/fingerprint/FingerprintSensorPropertiesInternal.java b/core/java/android/hardware/fingerprint/FingerprintSensorPropertiesInternal.java
index 1b1337072f5e..58f6e62af320 100644
--- a/core/java/android/hardware/fingerprint/FingerprintSensorPropertiesInternal.java
+++ b/core/java/android/hardware/fingerprint/FingerprintSensorPropertiesInternal.java
@@ -62,7 +62,7 @@ public class FingerprintSensorPropertiesInternal extends SensorPropertiesInterna
 
     public FingerprintSensorPropertiesInternal(int sensorId,
             @SensorProperties.Strength int strength, int maxEnrollmentsPerUser,
-            List<ComponentInfoInternal> componentInfo,
+            @NonNull List<ComponentInfoInternal> componentInfo,
             @FingerprintSensorProperties.SensorType int sensorType,
             boolean resetLockoutRequiresHardwareAuthToken, int sensorLocationX, int sensorLocationY,
             int sensorRadius) {
@@ -83,7 +83,7 @@ public class FingerprintSensorPropertiesInternal extends SensorPropertiesInterna
      */
     public FingerprintSensorPropertiesInternal(int sensorId,
             @SensorProperties.Strength int strength, int maxEnrollmentsPerUser,
-            List<ComponentInfoInternal> componentInfo,
+            @NonNull List<ComponentInfoInternal> componentInfo,
             @FingerprintSensorProperties.SensorType int sensorType,
             boolean resetLockoutRequiresHardwareAuthToken) {
         // TODO(b/179175438): Value should be provided from the HAL
@@ -99,7 +99,7 @@ public class FingerprintSensorPropertiesInternal extends SensorPropertiesInterna
     // TODO(b/179175438): Remove this constructor once all HALs move to AIDL.
     public FingerprintSensorPropertiesInternal(@NonNull Context context, int sensorId,
             @SensorProperties.Strength int strength, int maxEnrollmentsPerUser,
-            List<ComponentInfoInternal> componentInfo,
+            @NonNull List<ComponentInfoInternal> componentInfo,
             @FingerprintSensorProperties.SensorType int sensorType,
             boolean resetLockoutRequiresHardwareAuthToken) {
         super(sensorId, strength, maxEnrollmentsPerUser, componentInfo,
diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java
index b6c50487ace6..ca29057c9888 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceProvider.java
@@ -27,6 +27,7 @@ import android.hardware.biometrics.ComponentInfoInternal;
 import android.hardware.biometrics.IInvalidationCallback;
 import android.hardware.biometrics.ITestSession;
 import android.hardware.biometrics.ITestSessionCallback;
+import android.hardware.biometrics.common.ComponentInfo;
 import android.hardware.biometrics.face.IFace;
 import android.hardware.biometrics.face.SensorProps;
 import android.hardware.face.Face;
@@ -137,8 +138,7 @@ public class FaceProvider implements IBinder.DeathRecipient, ServiceProvider {
 
             final List<ComponentInfoInternal> componentInfo = new ArrayList<>();
             if (prop.commonProps.componentInfo != null) {
-                for (android.hardware.biometrics.common.ComponentInfo info
-                        : prop.commonProps.componentInfo) {
+                for (ComponentInfo info : prop.commonProps.componentInfo) {
                     componentInfo.add(new ComponentInfoInternal(info.componentId,
                             info.hardwareVersion, info.firmwareVersion, info.serialNumber,
                             info.softwareVersion));
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 f8af650ab25b..1b5def6c7063 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
@@ -29,6 +29,7 @@ import android.hardware.biometrics.ComponentInfoInternal;
 import android.hardware.biometrics.IInvalidationCallback;
 import android.hardware.biometrics.ITestSession;
 import android.hardware.biometrics.ITestSessionCallback;
+import android.hardware.biometrics.common.ComponentInfo;
 import android.hardware.biometrics.fingerprint.IFingerprint;
 import android.hardware.biometrics.fingerprint.SensorProps;
 import android.hardware.fingerprint.Fingerprint;
@@ -141,8 +142,7 @@ public class FingerprintProvider implements IBinder.DeathRecipient, ServiceProvi
 
             final List<ComponentInfoInternal> componentInfo = new ArrayList<>();
             if (prop.commonProps.componentInfo != null) {
-                for (android.hardware.biometrics.common.ComponentInfo info
-                        : prop.commonProps.componentInfo) {
+                for (ComponentInfo info : prop.commonProps.componentInfo) {
                     componentInfo.add(new ComponentInfoInternal(info.componentId,
                             info.hardwareVersion, info.firmwareVersion, info.serialNumber,
                             info.softwareVersion));