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

Commit 83010aa4 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Add biometric modality to dumpsys"

parents e069ac2c 08dbb4b9

core/proto/android/server/biometrics.proto

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

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

+1 −0
Original line number Diff line number Diff line
@@ -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()) {

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

+1 −0
Original line number Diff line number Diff line
@@ -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()) {

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

+1 −0
Original line number Diff line number Diff line
@@ -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()) {

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

+1 −0
Original line number Diff line number Diff line
@@ -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()) {