Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bcba57a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add nullability annotations and imports" into sc-dev am: 3d345db0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13931662

Change-Id: I6ed7c3fb64569b5eeba01675160032fd70898ece
parents 71f60627 3d345db0

core/java/android/hardware/biometrics/ComponentInfoInternal.java

+8 −7
Original line number Diff line number Diff line
@@ -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;

core/java/android/hardware/biometrics/SensorPropertiesInternal.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/java/android/hardware/face/FaceSensorProperties.java

+3 −1
Original line number Diff line number Diff line
@@ -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;

    }

core/java/android/hardware/face/FaceSensorPropertiesInternal.java

+2 −1
Original line number Diff line number Diff line
@@ -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

core/java/android/hardware/fingerprint/FingerprintSensorProperties.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

    }