Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add extra flags to biometrics proto for tests." into sc-dev

Browse Source
This commit is contained in:
Joe Bolinger
2021-05-13 18:04:56 +00:00
committed by Android (Google) Code Review
parent dbdfbda7ee 7d19b1ef7a
commit 9f43567a93
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/proto/android/server/biometrics.proto
View File

@@ -113,11 +113,16 @@ message SensorStateProto {
IRIS = 3; IRIS = 3;
} }
enum ModalityFlag {
FINGERPRINT_UDFPS = 0;
}
option (.android.msg_privacy).dest = DEST_AUTOMATIC; option (.android.msg_privacy).dest = DEST_AUTOMATIC;
// Unique sensorId // Unique sensorId
optional int32 sensor_id = 1; optional int32 sensor_id = 1;
// The type of the sensor.
optional Modality modality = 2; optional Modality modality = 2;
// The current strength (see {@link BiometricManager.Authenticators}) of this sensor, taking any // 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 // 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. // biometric TEE (or equivalent), and wrapped within the HAT.
optional bool reset_lockout_requires_challenge = 7; 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. // State of a specific user for a specific sensor.

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

@@ -546,6 +546,9 @@ class Sensor {
proto.write(SensorStateProto.SENSOR_ID, mSensorProperties.sensorId); proto.write(SensorStateProto.SENSOR_ID, mSensorProperties.sensorId);
proto.write(SensorStateProto.MODALITY, SensorStateProto.FINGERPRINT); proto.write(SensorStateProto.MODALITY, SensorStateProto.FINGERPRINT);
if (mSensorProperties.isAnyUdfpsType()) {
proto.write(SensorStateProto.MODALITY_FLAGS, SensorStateProto.FINGERPRINT_UDFPS);
}
proto.write(SensorStateProto.CURRENT_STRENGTH, proto.write(SensorStateProto.CURRENT_STRENGTH,
Utils.getCurrentStrength(mSensorProperties.sensorId)); Utils.getCurrentStrength(mSensorProperties.sensorId));
proto.write(SensorStateProto.SCHEDULER, mScheduler.dumpProtoState(clearSchedulerBuffer)); proto.write(SensorStateProto.SCHEDULER, mScheduler.dumpProtoState(clearSchedulerBuffer));

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

@@ -760,6 +760,9 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
proto.write(SensorStateProto.SENSOR_ID, mSensorProperties.sensorId); proto.write(SensorStateProto.SENSOR_ID, mSensorProperties.sensorId);
proto.write(SensorStateProto.MODALITY, SensorStateProto.FINGERPRINT); proto.write(SensorStateProto.MODALITY, SensorStateProto.FINGERPRINT);
if (mSensorProperties.isAnyUdfpsType()) {
proto.write(SensorStateProto.MODALITY_FLAGS, SensorStateProto.FINGERPRINT_UDFPS);
}
proto.write(SensorStateProto.CURRENT_STRENGTH, proto.write(SensorStateProto.CURRENT_STRENGTH,
Utils.getCurrentStrength(mSensorProperties.sensorId)); Utils.getCurrentStrength(mSensorProperties.sensorId));
proto.write(SensorStateProto.SCHEDULER, mScheduler.dumpProtoState(clearSchedulerBuffer)); proto.write(SensorStateProto.SCHEDULER, mScheduler.dumpProtoState(clearSchedulerBuffer));