From 71005c54994a646affe645f1c61078e15df0e01b Mon Sep 17 00:00:00 2001
From: Ilya Matyukhin <ilyamaty@google.com>
Date: Wed, 17 Feb 2021 12:44:14 -0800
Subject: [PATCH] Update default HAL with close and reset methods

Bug: 180521746
Test: atest VtsHalBiometricsFingerprintTargetTest
Change-Id: I3331f8185ff90106a2500fe5ca17836e8127add5
---
 biometrics/fingerprint/aidl/default/Fingerprint.cpp       | 5 +++++
 biometrics/fingerprint/aidl/default/Session.cpp           | 5 +++++
 biometrics/fingerprint/aidl/default/include/Fingerprint.h | 2 ++
 biometrics/fingerprint/aidl/default/include/Session.h     | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/biometrics/fingerprint/aidl/default/Fingerprint.cpp b/biometrics/fingerprint/aidl/default/Fingerprint.cpp
index fa3171f850..6f893468a8 100644
--- a/biometrics/fingerprint/aidl/default/Fingerprint.cpp
+++ b/biometrics/fingerprint/aidl/default/Fingerprint.cpp
@@ -58,4 +58,9 @@ ndk::ScopedAStatus Fingerprint::createSession(int32_t /*sensorId*/, int32_t /*us
     *out = SharedRefBase::make<Session>(cb);
     return ndk::ScopedAStatus::ok();
 }
+
+ndk::ScopedAStatus Fingerprint::reset() {
+    return ndk::ScopedAStatus::ok();
+}
+
 }  // namespace aidl::android::hardware::biometrics::fingerprint
diff --git a/biometrics/fingerprint/aidl/default/Session.cpp b/biometrics/fingerprint/aidl/default/Session.cpp
index 52dddb665e..c928df4dd5 100644
--- a/biometrics/fingerprint/aidl/default/Session.cpp
+++ b/biometrics/fingerprint/aidl/default/Session.cpp
@@ -99,6 +99,11 @@ ndk::ScopedAStatus Session::resetLockout(int32_t /*cookie*/,
     return ndk::ScopedAStatus::ok();
 }
 
+ndk::ScopedAStatus Session::close(int32_t /*cookie*/) {
+    LOG(INFO) << "close";
+    return ndk::ScopedAStatus::ok();
+}
+
 ndk::ScopedAStatus Session::onPointerDown(int32_t /*pointerId*/, int32_t /*x*/, int32_t /*y*/,
                                           float /*minor*/, float /*major*/) {
     LOG(INFO) << "onPointerDown";
diff --git a/biometrics/fingerprint/aidl/default/include/Fingerprint.h b/biometrics/fingerprint/aidl/default/include/Fingerprint.h
index 867e5fafb3..ce1366cf4c 100644
--- a/biometrics/fingerprint/aidl/default/include/Fingerprint.h
+++ b/biometrics/fingerprint/aidl/default/include/Fingerprint.h
@@ -29,6 +29,8 @@ class Fingerprint final : public BnFingerprint {
     ndk::ScopedAStatus createSession(int32_t sensorId, int32_t userId,
                                      const std::shared_ptr<ISessionCallback>& cb,
                                      std::shared_ptr<ISession>* out) override;
+
+    ndk::ScopedAStatus reset() override;
 };
 
 }  // namespace aidl::android::hardware::biometrics::fingerprint
diff --git a/biometrics/fingerprint/aidl/default/include/Session.h b/biometrics/fingerprint/aidl/default/include/Session.h
index b9befef119..99d806b5e5 100644
--- a/biometrics/fingerprint/aidl/default/include/Session.h
+++ b/biometrics/fingerprint/aidl/default/include/Session.h
@@ -53,6 +53,8 @@ class Session : public BnSession {
     ndk::ScopedAStatus resetLockout(int32_t cookie,
                                     const keymaster::HardwareAuthToken& hat) override;
 
+    ndk::ScopedAStatus close(int32_t cookie) override;
+
     ndk::ScopedAStatus onPointerDown(int32_t pointerId, int32_t x, int32_t y, float minor,
                                      float major) override;