| commit | cbbfa93a17647f59a5a8c84243f86d4cab4623b7 | [log] [tgz] |
|---|---|---|
| author | Ilya Matyukhin <ilyamaty@google.com> | Mon Mar 22 13:25:15 2021 -0700 |
| committer | Ilya Matyukhin <ilyamaty@google.com> | Mon Mar 22 14:43:22 2021 -0700 |
| tree | 6e0f924d0bbd1c426a55560c61ca6c8db644559e | |
| parent | 977c1dcfe973af8573e1873047cbf70d48eff877 [diff] |
Add ISessionCallback#onSessionClosed Bug: 181984005 Test: m android.hardware.biometrics.fingerprint-update-api Test: m android.hardware.biometrics.face-update-api Test: atest VtsHalBiometricsFingerprintTargetTest Change-Id: I766c3ae0dc9916c376da6432a5545af581dda819
diff --git a/biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/ISessionCallback.aidl b/biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/ISessionCallback.aidl index 13c2b05..3a97717 100644 --- a/biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/ISessionCallback.aidl +++ b/biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/ISessionCallback.aidl
@@ -50,4 +50,5 @@ void onEnrollmentsRemoved(in int[] enrollmentIds); void onAuthenticatorIdRetrieved(in long authenticatorId); void onAuthenticatorIdInvalidated(in long newAuthenticatorId); + void onSessionClosed(); }
diff --git a/biometrics/fingerprint/aidl/android/hardware/biometrics/fingerprint/ISessionCallback.aidl b/biometrics/fingerprint/aidl/android/hardware/biometrics/fingerprint/ISessionCallback.aidl index fde1df7..cf3a271 100644 --- a/biometrics/fingerprint/aidl/android/hardware/biometrics/fingerprint/ISessionCallback.aidl +++ b/biometrics/fingerprint/aidl/android/hardware/biometrics/fingerprint/ISessionCallback.aidl
@@ -200,4 +200,10 @@ * current set of enrollments. */ void onAuthenticatorIdInvalidated(in long newAuthenticatorId); + + /** + * This method notifes the client that this session has closed. + * The client must not make any more calls to this session. + */ + void onSessionClosed(); }
diff --git a/biometrics/fingerprint/aidl/default/Session.cpp b/biometrics/fingerprint/aidl/default/Session.cpp index c035407..f030f13 100644 --- a/biometrics/fingerprint/aidl/default/Session.cpp +++ b/biometrics/fingerprint/aidl/default/Session.cpp
@@ -219,11 +219,11 @@ return ndk::ScopedAStatus::ok(); } -ndk::ScopedAStatus Session::close(int32_t cookie) { +ndk::ScopedAStatus Session::close(int32_t /*cookie*/) { LOG(INFO) << "close"; CHECK(mCurrentState == SessionState::IDLING) << "Can't close a non-idling session. Crashing."; mCurrentState = SessionState::CLOSED; - mCb->onStateChanged(cookie, mCurrentState); + mCb->onSessionClosed(); return ndk::ScopedAStatus::ok(); }
diff --git a/biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp b/biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp index 894fdfe..885f703 100644 --- a/biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp +++ b/biometrics/fingerprint/aidl/vts/VtsHalBiometricsFingerprintTargetTest.cpp
@@ -119,6 +119,8 @@ return ndk::ScopedAStatus::ok(); } + ndk::ScopedAStatus onSessionClosed() override { return ndk::ScopedAStatus::ok(); } + private: bool mIsPromiseValid; std::vector<Invocation> mInvocations;