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

Commit de4d1e95 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "fix-IFace-enroll" into sc-dev 

* changes:
  IFace: update VTS test to pass std::nullopt for previewSurface
  IFace: update default implementation to use optional previewSurface
  IFace: annotate the previewSurface as @nullable in enroll
parents 70b9c171 88796f49

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/1/.hash

+1 −1
Original line number Diff line number Diff line 
945de3635b7f5a09244820eef56035c92fdbd324
 
3b10f5094c5af9fe551093597fab007d1e148256

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/1/android/hardware/biometrics/face/ISession.aidl

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ interface ISession { 
  void generateChallenge();

  void revokeChallenge(in long challenge);

  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 detectInteraction();

  void enumerateEnrollments();

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ interface ISession { 
  void generateChallenge();

  void revokeChallenge(in long challenge);

  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 detectInteraction();

  void enumerateEnrollments();

biometrics/face/aidl/android/hardware/biometrics/face/ISession.aidl

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ interface ISession { 
     * operation.

     */

    ICancellationSignal enroll(in HardwareAuthToken hat, in EnrollmentType type,

            in Feature[] features, in NativeHandle previewSurface);

            in Feature[] features, in @nullable NativeHandle previewSurface);



    /**

     * authenticate:

biometrics/face/aidl/default/Session.cpp

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


ndk::ScopedAStatus Session::enroll(

        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*/) {

    LOG(INFO) << "enroll";

    if (cb_) {