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

Merge "Add biometric modality to dumpsys"

Browse Source
This commit is contained in:
Kevin Chyn
2021-01-13 01:49:43 +00:00
committed by Android (Google) Code Review
parent e069ac2c91 08dbb4b9c4
commit 83010aa483
5 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,16 +106,25 @@ message SensorServiceStateProto {
// State of a single sensor.
message SensorStateProto {
enum Modality {
UNKNOWN = 0;
FINGERPRINT = 1;
FACE = 2;
IRIS = 3;
}
option (.android.msg_privacy).dest = DEST_AUTOMATIC;
// Unique sensorId
optional int32 sensor_id = 1;
optional Modality modality = 2;
// State of the sensor's scheduler. True if currently handling an operation, false if idle.
optional bool is_busy = 2;
optional bool is_busy = 3;
// User states for this sensor.
repeated UserStateProto user_states = 3;
repeated UserStateProto user_states = 4;
}
// State of a specific user for a specific sensor.

1
services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java
View File

@@ -460,6 +460,7 @@ public class Sensor implements IBinder.DeathRecipient {
final long sensorToken = proto.start(SensorServiceStateProto.SENSOR_STATES);
proto.write(SensorStateProto.SENSOR_ID, mSensorProperties.sensorId);
proto.write(SensorStateProto.MODALITY, SensorStateProto.FACE);
proto.write(SensorStateProto.IS_BUSY, mScheduler.getCurrentClient() != null);
for (UserInfo user : UserManager.get(mContext).getUsers()) {

1
services/core/java/com/android/server/biometrics/sensors/face/hidl/Face10.java
View File

@@ -770,6 +770,7 @@ public class Face10 implements IHwBinder.DeathRecipient, ServiceProvider {
final long sensorToken = proto.start(SensorServiceStateProto.SENSOR_STATES);
proto.write(SensorStateProto.SENSOR_ID, mSensorProperties.sensorId);
proto.write(SensorStateProto.MODALITY, SensorStateProto.FACE);
proto.write(SensorStateProto.IS_BUSY, mScheduler.getCurrentClient() != null);
for (UserInfo user : UserManager.get(mContext).getUsers()) {

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

@@ -473,6 +473,7 @@ class Sensor implements IBinder.DeathRecipient {
final long sensorToken = proto.start(SensorServiceStateProto.SENSOR_STATES);
proto.write(SensorStateProto.SENSOR_ID, mSensorProperties.sensorId);
proto.write(SensorStateProto.MODALITY, SensorStateProto.FINGERPRINT);
proto.write(SensorStateProto.IS_BUSY, mScheduler.getCurrentClient() != null);
for (UserInfo user : UserManager.get(mContext).getUsers()) {

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

@@ -716,6 +716,7 @@ public class Fingerprint21 implements IHwBinder.DeathRecipient, ServiceProvider
final long sensorToken = proto.start(SensorServiceStateProto.SENSOR_STATES);
proto.write(SensorStateProto.SENSOR_ID, mSensorProperties.sensorId);
proto.write(SensorStateProto.MODALITY, SensorStateProto.FINGERPRINT);
proto.write(SensorStateProto.IS_BUSY, mScheduler.getCurrentClient() != null);
for (UserInfo user : UserManager.get(mContext).getUsers()) {