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

Commit 67310c3f authored by Joshua McCloskey's avatar Joshua McCloskey
Browse files

Updated face session to use SurfaceView 

Test: Verified that it builds.
Test: Verified framework supports older NativeHandle.
Bug: 308784038
Change-Id: I6f5fa573bdfcfd903b53d8d85c43f491413bdcae
parent f7c35dfa

biometrics/face/aidl/Android.bp

+9 −1
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ aidl_interface { 
        "android.hardware.common-V2",

        "android.hardware.keymaster-V4",

    ],

    include_dirs: [

        "frameworks/native/aidl/gui",

    ],

    stability: "vintf",

    backend: {

        java: {
@@ -26,6 +29,11 @@ aidl_interface { 
        cpp: {

            enabled: false,

        },

        ndk: {

            additional_shared_libraries: [

                "libnativewindow",

            ],

        },

    },

    versions_with_info: [

        {
@@ -54,6 +62,6 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,



}

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

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

@Backing(type="byte") @VintfStability

enum AcquiredInfo {

  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,

  UNKNOWN,

  GOOD,

  INSUFFICIENT,

  TOO_BRIGHT,

  TOO_DARK,

  TOO_CLOSE,

  TOO_FAR,

  FACE_TOO_HIGH,

  FACE_TOO_LOW,

  FACE_TOO_RIGHT,

  FACE_TOO_LEFT,

  POOR_GAZE,

  NOT_DETECTED,

  TOO_MUCH_MOTION,

  RECALIBRATE,

  TOO_DIFFERENT,

  TOO_SIMILAR,

  PAN_TOO_EXTREME,

  TILT_TOO_EXTREME,

  ROLL_TOO_EXTREME,

  FACE_OBSCURED,

  START,

  SENSOR_DIRTY,

  VENDOR,

  FIRST_FRAME_RECEIVED,

  DARK_GLASSES_DETECTED,

  MOUTH_COVERING_DETECTED,

}

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

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

@Backing(type="byte") @VintfStability

enum EnrollmentStage {

  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,

  UNKNOWN,

  FIRST_FRAME_RECEIVED,

  WAITING_FOR_CENTERING,

  HOLD_STILL_IN_CENTER,

  ENROLLING_MOVEMENT_1,

  ENROLLING_MOVEMENT_2,

  ENROLLMENT_FINISHED,

}

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

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

@Backing(type="byte") @VintfStability

enum EnrollmentType {

  DEFAULT = 0,

  ACCESSIBILITY = 1,

  DEFAULT,

  ACCESSIBILITY,

}

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

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

@Backing(type="byte") @VintfStability

enum Error {

  UNKNOWN = 0,

  HW_UNAVAILABLE = 1,

  UNABLE_TO_PROCESS = 2,

  TIMEOUT = 3,

  NO_SPACE = 4,

  CANCELED = 5,

  UNABLE_TO_REMOVE = 6,

  VENDOR = 7,

  REENROLL_REQUIRED = 8,

  UNKNOWN,

  HW_UNAVAILABLE,

  UNABLE_TO_PROCESS,

  TIMEOUT,

  NO_SPACE,

  CANCELED,

  UNABLE_TO_REMOVE,

  VENDOR,

  REENROLL_REQUIRED,

}