From 146f6c8f1dd935d36fedabc19fe6b90080d71b24 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Wed, 10 Feb 2021 11:32:35 -0800 Subject: [PATCH] Add logs to default biometric HALs Bug: 179856730 Test: Presubmit Change-Id: I6ebf88b36e075586d2596af7a82b4ab8cf24ad22 --- biometrics/face/aidl/default/Session.cpp | 13 +++++++++++++ biometrics/fingerprint/aidl/default/Session.cpp | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/biometrics/face/aidl/default/Session.cpp b/biometrics/face/aidl/default/Session.cpp index 63d1721314..bd5a0625f9 100644 --- a/biometrics/face/aidl/default/Session.cpp +++ b/biometrics/face/aidl/default/Session.cpp @@ -15,6 +15,7 @@ */ #include +#include #include "Session.h" @@ -37,6 +38,7 @@ class CancellationSignal : public common::BnCancellationSignal { Session::Session(std::shared_ptr cb) : cb_(std::move(cb)) {} ndk::ScopedAStatus Session::generateChallenge(int32_t /*cookie*/, int32_t /*timeoutSec*/) { + LOG(INFO) << "generateChallenge"; if (cb_) { cb_->onStateChanged(0, SessionState::GENERATING_CHALLENGE); cb_->onChallengeGenerated(0); @@ -46,6 +48,7 @@ ndk::ScopedAStatus Session::generateChallenge(int32_t /*cookie*/, int32_t /*time } ndk::ScopedAStatus Session::revokeChallenge(int32_t /*cookie*/, int64_t challenge) { + LOG(INFO) << "revokeChallenge"; if (cb_) { cb_->onStateChanged(0, SessionState::REVOKING_CHALLENGE); cb_->onChallengeRevoked(challenge); @@ -59,11 +62,13 @@ ndk::ScopedAStatus Session::enroll( EnrollmentType /*enrollmentType*/, const std::vector& /*features*/, const NativeHandle& /*previewSurface*/, std::shared_ptr* /*return_val*/) { + LOG(INFO) << "enroll"; return ndk::ScopedAStatus::ok(); } ndk::ScopedAStatus Session::authenticate(int32_t /*cookie*/, int64_t /*keystoreOperationId*/, std::shared_ptr* return_val) { + LOG(INFO) << "authenticate"; if (cb_) { cb_->onStateChanged(0, SessionState::AUTHENTICATING); } @@ -73,10 +78,12 @@ ndk::ScopedAStatus Session::authenticate(int32_t /*cookie*/, int64_t /*keystoreO ndk::ScopedAStatus Session::detectInteraction( int32_t /*cookie*/, std::shared_ptr* /*return_val*/) { + LOG(INFO) << "detectInteraction"; return ndk::ScopedAStatus::ok(); } ndk::ScopedAStatus Session::enumerateEnrollments(int32_t /*cookie*/) { + LOG(INFO) << "enumerateEnrollments"; if (cb_) { cb_->onStateChanged(0, SessionState::ENUMERATING_ENROLLMENTS); cb_->onEnrollmentsEnumerated(std::vector()); @@ -87,6 +94,7 @@ ndk::ScopedAStatus Session::enumerateEnrollments(int32_t /*cookie*/) { ndk::ScopedAStatus Session::removeEnrollments(int32_t /*cookie*/, const std::vector& /*enrollmentIds*/) { + LOG(INFO) << "removeEnrollments"; if (cb_) { cb_->onStateChanged(0, SessionState::REMOVING_ENROLLMENTS); cb_->onEnrollmentsRemoved(std::vector()); @@ -96,6 +104,7 @@ ndk::ScopedAStatus Session::removeEnrollments(int32_t /*cookie*/, } ndk::ScopedAStatus Session::getFeatures(int32_t /*cookie*/, int32_t /*enrollmentId*/) { + LOG(INFO) << "getFeatures"; return ndk::ScopedAStatus::ok(); } @@ -103,10 +112,12 @@ ndk::ScopedAStatus Session::setFeature(int32_t /*cookie*/, 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*/) { + LOG(INFO) << "getAuthenticatorId"; if (cb_) { cb_->onStateChanged(0, SessionState::GETTING_AUTHENTICATOR_ID); cb_->onAuthenticatorIdRetrieved(0 /* authenticatorId */); @@ -116,11 +127,13 @@ ndk::ScopedAStatus Session::getAuthenticatorId(int32_t /*cookie*/) { } ndk::ScopedAStatus Session::invalidateAuthenticatorId(int32_t /*cookie*/) { + LOG(INFO) << "invalidateAuthenticatorId"; return ndk::ScopedAStatus::ok(); } ndk::ScopedAStatus Session::resetLockout(int32_t /*cookie*/, const keymaster::HardwareAuthToken& /*hat*/) { + LOG(INFO) << "resetLockout"; if (cb_) { cb_->onStateChanged(0, SessionState::RESETTING_LOCKOUT); cb_->onLockoutCleared(); diff --git a/biometrics/fingerprint/aidl/default/Session.cpp b/biometrics/fingerprint/aidl/default/Session.cpp index bf08203707..844622101e 100644 --- a/biometrics/fingerprint/aidl/default/Session.cpp +++ b/biometrics/fingerprint/aidl/default/Session.cpp @@ -15,6 +15,7 @@ */ #include +#include #include "Session.h" @@ -28,20 +29,24 @@ class CancellationSignal : public common::BnCancellationSignal { Session::Session(std::shared_ptr cb) : cb_(std::move(cb)) {} ndk::ScopedAStatus Session::generateChallenge(int32_t /*cookie*/, int32_t /*timeoutSec*/) { + LOG(INFO) << "generateChallenge"; return ndk::ScopedAStatus::ok(); } ndk::ScopedAStatus Session::revokeChallenge(int32_t /*cookie*/, int64_t /*challenge*/) { + LOG(INFO) << "revokeChallenge"; return ndk::ScopedAStatus::ok(); } ndk::ScopedAStatus Session::enroll(int32_t /*cookie*/, const keymaster::HardwareAuthToken& /*hat*/, std::shared_ptr* /*return_val*/) { + LOG(INFO) << "enroll"; return ndk::ScopedAStatus::ok(); } ndk::ScopedAStatus Session::authenticate(int32_t /*cookie*/, int64_t /*keystoreOperationId*/, std::shared_ptr* return_val) { + LOG(INFO) << "authenticate"; if (cb_) { cb_->onStateChanged(0, SessionState::AUTHENTICATING); } @@ -51,10 +56,12 @@ ndk::ScopedAStatus Session::authenticate(int32_t /*cookie*/, int64_t /*keystoreO ndk::ScopedAStatus Session::detectInteraction( int32_t /*cookie*/, std::shared_ptr* /*return_val*/) { + LOG(INFO) << "detectInteraction"; return ndk::ScopedAStatus::ok(); } ndk::ScopedAStatus Session::enumerateEnrollments(int32_t /*cookie*/) { + LOG(INFO) << "enumerateEnrollments"; if (cb_) { cb_->onStateChanged(0, SessionState::ENUMERATING_ENROLLMENTS); cb_->onEnrollmentsEnumerated(std::vector()); @@ -64,6 +71,7 @@ ndk::ScopedAStatus Session::enumerateEnrollments(int32_t /*cookie*/) { ndk::ScopedAStatus Session::removeEnrollments(int32_t /*cookie*/, const std::vector& /*enrollmentIds*/) { + LOG(INFO) << "removeEnrollments"; if (cb_) { cb_->onStateChanged(0, SessionState::REMOVING_ENROLLMENTS); cb_->onEnrollmentsRemoved(std::vector()); @@ -72,6 +80,7 @@ ndk::ScopedAStatus Session::removeEnrollments(int32_t /*cookie*/, } ndk::ScopedAStatus Session::getAuthenticatorId(int32_t /*cookie*/) { + LOG(INFO) << "getAuthenticatorId"; if (cb_) { cb_->onStateChanged(0, SessionState::GETTING_AUTHENTICATOR_ID); cb_->onAuthenticatorIdRetrieved(0 /* authenticatorId */); @@ -80,24 +89,29 @@ ndk::ScopedAStatus Session::getAuthenticatorId(int32_t /*cookie*/) { } ndk::ScopedAStatus Session::invalidateAuthenticatorId(int32_t /*cookie*/) { + LOG(INFO) << "invalidateAuthenticatorId"; return ndk::ScopedAStatus::ok(); } ndk::ScopedAStatus Session::resetLockout(int32_t /*cookie*/, const keymaster::HardwareAuthToken& /*hat*/) { + LOG(INFO) << "resetLockout"; return ndk::ScopedAStatus::ok(); } ndk::ScopedAStatus Session::onPointerDown(int32_t /*pointerId*/, int32_t /*x*/, int32_t /*y*/, float /*minor*/, float /*major*/) { + LOG(INFO) << "onPointerDown"; return ndk::ScopedAStatus::ok(); } ndk::ScopedAStatus Session::onPointerUp(int32_t /*pointerId*/) { + LOG(INFO) << "onPointerUp"; return ndk::ScopedAStatus::ok(); } ndk::ScopedAStatus Session::onUiReady() { + LOG(INFO) << "onUiReady"; return ndk::ScopedAStatus::ok(); } } // namespace aidl::android::hardware::biometrics::fingerprint