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

Commit 79105cf2 authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Add extra flags to biometrics proto for tests." into sc-dev am: 9f43567a 

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

Change-Id: Ia7958d86d98c02317560bc9badb7b653746a5105
parents d9801999 9f43567a

core/proto/android/server/biometrics.proto

+8 −0
Original line number Diff line number Diff line
@@ -113,11 +113,16 @@ message SensorStateProto { 
        IRIS = 3;

    }



    enum ModalityFlag {

        FINGERPRINT_UDFPS = 0;

    }



    option (.android.msg_privacy).dest = DEST_AUTOMATIC;



    // Unique sensorId

    optional int32 sensor_id = 1;



    // The type of the sensor.

    optional Modality modality = 2;



    // The current strength (see {@link BiometricManager.Authenticators}) of this sensor, taking any
@@ -137,6 +142,9 @@ message SensorStateProto { 
    // True if a HAT is required (field above) AND a challenge needs to be generated by the

    // biometric TEE (or equivalent), and wrapped within the HAT.

    optional bool reset_lockout_requires_challenge = 7;



    // Detailed information about the sensor's modality, if available.

    repeated ModalityFlag modality_flags = 8;

}



// State of a specific user for a specific sensor.

services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/Sensor.java

+3 −0
Original line number Diff line number Diff line
@@ -546,6 +546,9 @@ class Sensor { 


        proto.write(SensorStateProto.SENSOR_ID, mSensorProperties.sensorId);

        proto.write(SensorStateProto.MODALITY, SensorStateProto.FINGERPRINT);

        if (mSensorProperties.isAnyUdfpsType()) {

            proto.write(SensorStateProto.MODALITY_FLAGS, SensorStateProto.FINGERPRINT_UDFPS);

        }

        proto.write(SensorStateProto.CURRENT_STRENGTH,

                Utils.getCurrentStrength(mSensorProperties.sensorId));

        proto.write(SensorStateProto.SCHEDULER, mScheduler.dumpProtoState(clearSchedulerBuffer));

services/core/java/com/android/server/biometrics/sensors/fingerprint/hidl/Fingerprint21.java

+3 −0
Original line number Diff line number Diff line
@@ -760,6 +760,9 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider 


        proto.write(SensorStateProto.SENSOR_ID, mSensorProperties.sensorId);

        proto.write(SensorStateProto.MODALITY, SensorStateProto.FINGERPRINT);

        if (mSensorProperties.isAnyUdfpsType()) {

            proto.write(SensorStateProto.MODALITY_FLAGS, SensorStateProto.FINGERPRINT_UDFPS);

        }

        proto.write(SensorStateProto.CURRENT_STRENGTH,

                Utils.getCurrentStrength(mSensorProperties.sensorId));

        proto.write(SensorStateProto.SCHEDULER, mScheduler.dumpProtoState(clearSchedulerBuffer));