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

Commit af30cdec authored by Ilya Matyukhin's avatar Ilya Matyukhin
Browse files

Update the default implementation 

Bug: 174619156
Test: atest VtsHalBiometricsFaceTargetTest
Change-Id: Ibfa8ace1205ba500a865e09218f4fdc69eb6d8fb
parent 330dae02

biometrics/face/aidl/default/Session.cpp

+9 −7
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ namespace aidl::android::hardware::biometrics::face { 
class CancellationSignal : public common::BnCancellationSignal {

  private:

    std::shared_ptr<ISessionCallback> cb_;



  public:

    explicit CancellationSignal(std::shared_ptr<ISessionCallback> cb) : cb_(std::move(cb)) {}
@@ -53,10 +54,10 @@ ndk::ScopedAStatus Session::revokeChallenge(int32_t /*cookie*/, int64_t challeng 
    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus Session::enroll(int32_t /*cookie*/, const keymaster::HardwareAuthToken& /*hat*/,

                                   const NativeHandle& /*previewSurface*/,

                                   std::shared_ptr<biometrics::common::ICancellationSignal>*

                                   /*returnVal*/) {

ndk::ScopedAStatus Session::enroll(

        int32_t /*cookie*/, biometrics::face::EnrollmentType /*enrollmentType*/,

        const keymaster::HardwareAuthToken& /*hat*/, const NativeHandle& /*previewSurface*/,

        std::shared_ptr<biometrics::common::ICancellationSignal>* /*return_val*/) {

    return ndk::ScopedAStatus::ok();

}
@@ -115,4 +116,5 @@ ndk::ScopedAStatus Session::resetLockout(int32_t /*cookie*/, 
    }

    return ndk::ScopedAStatus::ok();

}



}  // namespace aidl::android::hardware::biometrics::face

biometrics/face/aidl/default/Session.h

+3 −3
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ class Session : public BnSession { 
    ndk::ScopedAStatus revokeChallenge(int32_t cookie, int64_t challenge) override;



    ndk::ScopedAStatus enroll(

            int32_t cookie, const keymaster::HardwareAuthToken& hat,

            const NativeHandle& previewSurface,

            std::shared_ptr<biometrics::common::ICancellationSignal>* returnVal) override;

            int32_t cookie, biometrics::face::EnrollmentType enrollmentType,

            const keymaster::HardwareAuthToken& hat, const NativeHandle& previewSurface,

            std::shared_ptr<biometrics::common::ICancellationSignal>* return_val) override;



    ndk::ScopedAStatus authenticate(

            int32_t cookie, int64_t keystoreOperationId,