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

Commit 1f203be6 authored by Ilya Matyukhin's avatar Ilya Matyukhin Committed by Automerger Merge Worker
Browse files

Merge changes from topic "IFace-explicit-close" into sc-dev am: 0fc4c85f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13618485

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91f57a704bedad733c5bd75006bafbd40445542d
parents 94672215 0fc4c85f

biometrics/face/aidl/default/Face.cpp

+4 −0
Original line number Diff line number Diff line
@@ -63,4 +63,8 @@ ndk::ScopedAStatus Face::createSession(int32_t /*sensorId*/, int32_t /*userId*/, 
    return ndk::ScopedAStatus::ok();

}



ndk::ScopedAStatus Face::reset() {

    return ndk::ScopedAStatus::ok();

}



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

biometrics/face/aidl/default/Face.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ class Face : public BnFace { 
    ndk::ScopedAStatus createSession(int32_t sensorId, int32_t userId,

                                     const std::shared_ptr<ISessionCallback>& cb,

                                     std::shared_ptr<ISession>* _aidl_return) override;



    ndk::ScopedAStatus reset() override;

};



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

biometrics/face/aidl/default/Session.cpp

+4 −0
Original line number Diff line number Diff line
@@ -142,4 +142,8 @@ ndk::ScopedAStatus Session::resetLockout(int32_t /*cookie*/, 
    return ndk::ScopedAStatus::ok();

}



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

    return ndk::ScopedAStatus::ok();

}



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

biometrics/face/aidl/default/Session.h

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ class Session : public BnSession { 
    ndk::ScopedAStatus resetLockout(int32_t cookie,

                                    const keymaster::HardwareAuthToken& hat) override;



    ndk::ScopedAStatus close(int32_t cookie) override;



  private:

    std::shared_ptr<ISessionCallback> cb_;

};