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

Commit 66c6464a authored by Ilya Matyukhin's avatar Ilya Matyukhin
Browse files

Remove SessionState from IFace example 

Bug: 183570051
Test: atest VtsHalBiometricsFaceTargetTest
Change-Id: Ia4c33f03e8482d5a89d2543a5bdcd851fbcd8a2c
parent c125d3a1

biometrics/face/aidl/default/Session.cpp

+18 −32
Original line number Diff line number Diff line
@@ -30,119 +30,105 @@ class CancellationSignal : public common::BnCancellationSignal { 


    ndk::ScopedAStatus cancel() override {

        cb_->onError(Error::CANCELED, 0 /* vendorCode */);

        cb_->onStateChanged(0, SessionState::IDLING);

        return ndk::ScopedAStatus::ok();

    }

};



Session::Session(std::shared_ptr<ISessionCallback> cb) : cb_(std::move(cb)) {}



ndk::ScopedAStatus Session::generateChallenge(int32_t /*cookie*/) {

ndk::ScopedAStatus Session::generateChallenge() {

    LOG(INFO) << "generateChallenge";

    if (cb_) {

        cb_->onStateChanged(0, SessionState::GENERATING_CHALLENGE);

        cb_->onChallengeGenerated(0);

        cb_->onStateChanged(0, SessionState::IDLING);

    }

    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus Session::revokeChallenge(int32_t /*cookie*/, int64_t challenge) {

ndk::ScopedAStatus Session::revokeChallenge(int64_t challenge) {

    LOG(INFO) << "revokeChallenge";

    if (cb_) {

        cb_->onStateChanged(0, SessionState::REVOKING_CHALLENGE);

        cb_->onChallengeRevoked(challenge);

        cb_->onStateChanged(0, SessionState::IDLING);

    }

    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus Session::enroll(

        int32_t /*cookie*/, const keymaster::HardwareAuthToken& /*hat*/,

        EnrollmentType /*enrollmentType*/, const std::vector<Feature>& /*features*/,

        const NativeHandle& /*previewSurface*/,

        const keymaster::HardwareAuthToken& /*hat*/, EnrollmentType /*enrollmentType*/,

        const std::vector<Feature>& /*features*/, const NativeHandle& /*previewSurface*/,

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

    LOG(INFO) << "enroll";

    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus Session::authenticate(int32_t /*cookie*/, int64_t /*keystoreOperationId*/,

ndk::ScopedAStatus Session::authenticate(int64_t /*keystoreOperationId*/,

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

    LOG(INFO) << "authenticate";

    if (cb_) {

        cb_->onStateChanged(0, SessionState::AUTHENTICATING);

        cb_->onError(Error::UNABLE_TO_PROCESS, 0 /* vendorCode */);

    }

    *return_val = SharedRefBase::make<CancellationSignal>(cb_);

    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus Session::detectInteraction(

        int32_t /*cookie*/, std::shared_ptr<common::ICancellationSignal>* /*return_val*/) {

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

    LOG(INFO) << "detectInteraction";

    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus Session::enumerateEnrollments(int32_t /*cookie*/) {

ndk::ScopedAStatus Session::enumerateEnrollments() {

    LOG(INFO) << "enumerateEnrollments";

    if (cb_) {

        cb_->onStateChanged(0, SessionState::ENUMERATING_ENROLLMENTS);

        cb_->onEnrollmentsEnumerated(std::vector<int32_t>());

        cb_->onStateChanged(0, SessionState::IDLING);

    }

    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus Session::removeEnrollments(int32_t /*cookie*/,

                                              const std::vector<int32_t>& /*enrollmentIds*/) {

ndk::ScopedAStatus Session::removeEnrollments(const std::vector<int32_t>& /*enrollmentIds*/) {

    LOG(INFO) << "removeEnrollments";

    if (cb_) {

        cb_->onStateChanged(0, SessionState::REMOVING_ENROLLMENTS);

        cb_->onEnrollmentsRemoved(std::vector<int32_t>());

        cb_->onStateChanged(0, SessionState::IDLING);

    }

    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus Session::getFeatures(int32_t /*cookie*/, int32_t /*enrollmentId*/) {

ndk::ScopedAStatus Session::getFeatures(int32_t /*enrollmentId*/) {

    LOG(INFO) << "getFeatures";

    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus Session::setFeature(int32_t /*cookie*/,

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

ndk::ScopedAStatus Session::setFeature(const keymaster::HardwareAuthToken& /*hat*/,

                                       int32_t /*enrollmentId*/, Feature /*feature*/,

                                       bool /*enabled*/) {

    LOG(INFO) << "setFeature";

    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus Session::getAuthenticatorId(int32_t /*cookie*/) {

ndk::ScopedAStatus Session::getAuthenticatorId() {

    LOG(INFO) << "getAuthenticatorId";

    if (cb_) {

        cb_->onStateChanged(0, SessionState::GETTING_AUTHENTICATOR_ID);

        cb_->onAuthenticatorIdRetrieved(0 /* authenticatorId */);

        cb_->onStateChanged(0, SessionState::IDLING);

    }

    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus Session::invalidateAuthenticatorId(int32_t /*cookie*/) {

ndk::ScopedAStatus Session::invalidateAuthenticatorId() {

    LOG(INFO) << "invalidateAuthenticatorId";

    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus Session::resetLockout(int32_t /*cookie*/,

                                         const keymaster::HardwareAuthToken& /*hat*/) {

ndk::ScopedAStatus Session::resetLockout(const keymaster::HardwareAuthToken& /*hat*/) {

    LOG(INFO) << "resetLockout";

    if (cb_) {

        cb_->onStateChanged(0, SessionState::RESETTING_LOCKOUT);

        cb_->onLockoutCleared();

        cb_->onStateChanged(0, SessionState::IDLING);

    }

    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus Session::close(int32_t /*cookie*/) {

ndk::ScopedAStatus Session::close() {

    if (cb_) {

        cb_->onSessionClosed();

    }

    return ndk::ScopedAStatus::ok();

}

biometrics/face/aidl/default/Session.h

+14 −16
Original line number Diff line number Diff line
@@ -30,40 +30,38 @@ class Session : public BnSession { 
  public:

    explicit Session(std::shared_ptr<ISessionCallback> cb);



    ndk::ScopedAStatus generateChallenge(int32_t cookie) override;

    ndk::ScopedAStatus generateChallenge() override;



    ndk::ScopedAStatus revokeChallenge(int32_t cookie, int64_t challenge) override;

    ndk::ScopedAStatus revokeChallenge(int64_t challenge) override;



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

    ndk::ScopedAStatus enroll(const keymaster::HardwareAuthToken& hat,

                              EnrollmentType enrollmentType, const std::vector<Feature>& features,

                              const NativeHandle& previewSurface,

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



    ndk::ScopedAStatus authenticate(

            int32_t cookie, int64_t keystoreOperationId,

            int64_t keystoreOperationId,

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



    ndk::ScopedAStatus detectInteraction(

            int32_t cookie, std::shared_ptr<common::ICancellationSignal>* returnVal) override;

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



    ndk::ScopedAStatus enumerateEnrollments(int32_t cookie) override;

    ndk::ScopedAStatus enumerateEnrollments() override;



    ndk::ScopedAStatus removeEnrollments(int32_t cookie,

                                         const std::vector<int32_t>& enrollmentIds) override;

    ndk::ScopedAStatus removeEnrollments(const std::vector<int32_t>& enrollmentIds) override;



    ndk::ScopedAStatus getFeatures(int32_t cookie, int32_t enrollmentId) override;

    ndk::ScopedAStatus getFeatures(int32_t enrollmentId) override;



    ndk::ScopedAStatus setFeature(int32_t cookie, const keymaster::HardwareAuthToken& hat,

                                  int32_t enrollmentId, Feature feature, bool enabled) override;

    ndk::ScopedAStatus setFeature(const keymaster::HardwareAuthToken& hat, int32_t enrollmentId,

                                  Feature feature, bool enabled) override;



    ndk::ScopedAStatus getAuthenticatorId(int32_t cookie) override;

    ndk::ScopedAStatus getAuthenticatorId() override;



    ndk::ScopedAStatus invalidateAuthenticatorId(int32_t cookie) override;

    ndk::ScopedAStatus invalidateAuthenticatorId() override;



    ndk::ScopedAStatus resetLockout(int32_t cookie,

                                    const keymaster::HardwareAuthToken& hat) override;

    ndk::ScopedAStatus resetLockout(const keymaster::HardwareAuthToken& hat) override;



    ndk::ScopedAStatus close(int32_t cookie) override;

    ndk::ScopedAStatus close() override;



  private:

    std::shared_ptr<ISessionCallback> cb_;