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

Commit 0c0e1843 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7588338 from de4d1e95 to sc-d1-release

Change-Id: Id85d0bcc8fed493c14043749693b784b1c592f72
parents 55fd1a95 de4d1e95
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
945de3635b7f5a09244820eef56035c92fdbd324
3b10f5094c5af9fe551093597fab007d1e148256
+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ interface ISession {
  void generateChallenge();
  void generateChallenge();
  void revokeChallenge(in long challenge);
  void revokeChallenge(in long challenge);
  android.hardware.biometrics.face.EnrollmentStageConfig[] getEnrollmentConfig(in android.hardware.biometrics.face.EnrollmentType enrollmentType);
  android.hardware.biometrics.face.EnrollmentStageConfig[] getEnrollmentConfig(in android.hardware.biometrics.face.EnrollmentType enrollmentType);
  android.hardware.biometrics.common.ICancellationSignal enroll(in android.hardware.keymaster.HardwareAuthToken hat, in android.hardware.biometrics.face.EnrollmentType type, in android.hardware.biometrics.face.Feature[] features, in android.hardware.common.NativeHandle previewSurface);
  android.hardware.biometrics.common.ICancellationSignal enroll(in android.hardware.keymaster.HardwareAuthToken hat, in android.hardware.biometrics.face.EnrollmentType type, in android.hardware.biometrics.face.Feature[] features, in @nullable android.hardware.common.NativeHandle previewSurface);
  android.hardware.biometrics.common.ICancellationSignal authenticate(in long operationId);
  android.hardware.biometrics.common.ICancellationSignal authenticate(in long operationId);
  android.hardware.biometrics.common.ICancellationSignal detectInteraction();
  android.hardware.biometrics.common.ICancellationSignal detectInteraction();
  void enumerateEnrollments();
  void enumerateEnrollments();
+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ interface ISession {
  void generateChallenge();
  void generateChallenge();
  void revokeChallenge(in long challenge);
  void revokeChallenge(in long challenge);
  android.hardware.biometrics.face.EnrollmentStageConfig[] getEnrollmentConfig(in android.hardware.biometrics.face.EnrollmentType enrollmentType);
  android.hardware.biometrics.face.EnrollmentStageConfig[] getEnrollmentConfig(in android.hardware.biometrics.face.EnrollmentType enrollmentType);
  android.hardware.biometrics.common.ICancellationSignal enroll(in android.hardware.keymaster.HardwareAuthToken hat, in android.hardware.biometrics.face.EnrollmentType type, in android.hardware.biometrics.face.Feature[] features, in android.hardware.common.NativeHandle previewSurface);
  android.hardware.biometrics.common.ICancellationSignal enroll(in android.hardware.keymaster.HardwareAuthToken hat, in android.hardware.biometrics.face.EnrollmentType type, in android.hardware.biometrics.face.Feature[] features, in @nullable android.hardware.common.NativeHandle previewSurface);
  android.hardware.biometrics.common.ICancellationSignal authenticate(in long operationId);
  android.hardware.biometrics.common.ICancellationSignal authenticate(in long operationId);
  android.hardware.biometrics.common.ICancellationSignal detectInteraction();
  android.hardware.biometrics.common.ICancellationSignal detectInteraction();
  void enumerateEnrollments();
  void enumerateEnrollments();
+1 −1
Original line number Original line Diff line number Diff line
@@ -154,7 +154,7 @@ interface ISession {
     * operation.
     * operation.
     */
     */
    ICancellationSignal enroll(in HardwareAuthToken hat, in EnrollmentType type,
    ICancellationSignal enroll(in HardwareAuthToken hat, in EnrollmentType type,
            in Feature[] features, in NativeHandle previewSurface);
            in Feature[] features, in @nullable NativeHandle previewSurface);


    /**
    /**
     * authenticate:
     * authenticate:
+2 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,8 @@ ndk::ScopedAStatus Session::getEnrollmentConfig(EnrollmentType /*enrollmentType*


ndk::ScopedAStatus Session::enroll(
ndk::ScopedAStatus Session::enroll(
        const keymaster::HardwareAuthToken& /*hat*/, EnrollmentType /*enrollmentType*/,
        const keymaster::HardwareAuthToken& /*hat*/, EnrollmentType /*enrollmentType*/,
        const std::vector<Feature>& /*features*/, const NativeHandle& /*previewSurface*/,
        const std::vector<Feature>& /*features*/,
        const std::optional<NativeHandle>& /*previewSurface*/,
        std::shared_ptr<biometrics::common::ICancellationSignal>* /*return_val*/) {
        std::shared_ptr<biometrics::common::ICancellationSignal>* /*return_val*/) {
    LOG(INFO) << "enroll";
    LOG(INFO) << "enroll";
    if (cb_) {
    if (cb_) {
Loading