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

Commit a6d4024c authored by Ilya Matyukhin's avatar Ilya Matyukhin Committed by Android (Google) Code Review
Browse files

Merge changes from topic "IFace-anapic-review" into sc-dev 

* changes:
  Add enum defaults and remove placeholder constants
  Add Session#getEnrollmentConfig and better enum defaults
parents 50a1bc27 c316f63c

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/AcquiredInfo.aidl

+27 −26
Original line number Diff line number Diff line
@@ -34,30 +34,31 @@ 
package android.hardware.biometrics.face;

@Backing(type="byte") @VintfStability

enum AcquiredInfo {

  GOOD = 0,

  INSUFFICIENT = 1,

  TOO_BRIGHT = 2,

  TOO_DARK = 3,

  TOO_CLOSE = 4,

  TOO_FAR = 5,

  FACE_TOO_HIGH = 6,

  FACE_TOO_LOW = 7,

  FACE_TOO_RIGHT = 8,

  FACE_TOO_LEFT = 9,

  POOR_GAZE = 10,

  NOT_DETECTED = 11,

  TOO_MUCH_MOTION = 12,

  RECALIBRATE = 13,

  TOO_DIFFERENT = 14,

  TOO_SIMILAR = 15,

  PAN_TOO_EXTREME = 16,

  TILT_TOO_EXTREME = 17,

  ROLL_TOO_EXTREME = 18,

  FACE_OBSCURED = 19,

  START = 20,

  SENSOR_DIRTY = 21,

  VENDOR = 22,

  FIRST_FRAME_RECEIVED = 23,

  DARK_GLASSES_DETECTED = 24,

  MOUTH_COVERING_DETECTED = 25,

  UNKNOWN = 0,

  GOOD = 1,

  INSUFFICIENT = 2,

  TOO_BRIGHT = 3,

  TOO_DARK = 4,

  TOO_CLOSE = 5,

  TOO_FAR = 6,

  FACE_TOO_HIGH = 7,

  FACE_TOO_LOW = 8,

  FACE_TOO_RIGHT = 9,

  FACE_TOO_LEFT = 10,

  POOR_GAZE = 11,

  NOT_DETECTED = 12,

  TOO_MUCH_MOTION = 13,

  RECALIBRATE = 14,

  TOO_DIFFERENT = 15,

  TOO_SIMILAR = 16,

  PAN_TOO_EXTREME = 17,

  TILT_TOO_EXTREME = 18,

  ROLL_TOO_EXTREME = 19,

  FACE_OBSCURED = 20,

  START = 21,

  SENSOR_DIRTY = 22,

  VENDOR = 23,

  FIRST_FRAME_RECEIVED = 24,

  DARK_GLASSES_DETECTED = 25,

  MOUTH_COVERING_DETECTED = 26,

}

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/BaseFrame.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
package android.hardware.biometrics.face;

@VintfStability

parcelable BaseFrame {

  android.hardware.biometrics.face.AcquiredInfo acquiredInfo = android.hardware.biometrics.face.AcquiredInfo.INSUFFICIENT;

  android.hardware.biometrics.face.AcquiredInfo acquiredInfo = android.hardware.biometrics.face.AcquiredInfo.UNKNOWN;

  int vendorCode;

  float pan;

  float tilt;

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/EnrollmentFrame.aidl

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ package android.hardware.biometrics.face; 
@VintfStability

parcelable EnrollmentFrame {

  @nullable android.hardware.biometrics.face.Cell cell;

  android.hardware.biometrics.face.EnrollmentStage stage = android.hardware.biometrics.face.EnrollmentStage.FIRST_FRAME_RECEIVED;

  android.hardware.biometrics.face.EnrollmentStage stage = android.hardware.biometrics.face.EnrollmentStage.UNKNOWN;

  android.hardware.biometrics.face.BaseFrame data;

}

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/EnrollmentStage.aidl

+7 −6
Original line number Diff line number Diff line
@@ -34,10 +34,11 @@ 
package android.hardware.biometrics.face;

@Backing(type="byte") @VintfStability

enum EnrollmentStage {

  FIRST_FRAME_RECEIVED = 0,

  WAITING_FOR_CENTERING = 1,

  HOLD_STILL_IN_CENTER = 2,

  ENROLLING_MOVEMENT_1 = 3,

  ENROLLING_MOVEMENT_2 = 4,

  ENROLLMENT_FINISHED = 5,

  UNKNOWN = 0,

  FIRST_FRAME_RECEIVED = 1,

  WAITING_FOR_CENTERING = 2,

  HOLD_STILL_IN_CENTER = 3,

  ENROLLING_MOVEMENT_1 = 4,

  ENROLLING_MOVEMENT_2 = 5,

  ENROLLMENT_FINISHED = 6,

}

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/EnrollmentStageConfig.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ 
package android.hardware.biometrics.face;

@VintfStability

parcelable EnrollmentStageConfig {

  android.hardware.biometrics.face.EnrollmentStage stage = android.hardware.biometrics.face.EnrollmentStage.FIRST_FRAME_RECEIVED;

  android.hardware.biometrics.face.EnrollmentStage stage = android.hardware.biometrics.face.EnrollmentStage.UNKNOWN;

  List<android.hardware.biometrics.face.Cell> cells;

}