sm7125-common: fingerprint: Send onFingerUp() on postEnroll and cancel FP

Change-Id: I1b788b43d421853afd42dd1b2a4b75b644498a3f
fourteen-wip
micky387 2 years ago committed by Simon1511
parent 6ddf30bfdd
commit bdd3d870b0
  1. 6
      fingerprint/BiometricsFingerprint.cpp

@ -178,7 +178,6 @@ Return<RequestStatus> BiometricsFingerprint::ErrorFilter(int32_t error) {
// Translate from errors returned by traditional HAL (see fingerprint.h) to // Translate from errors returned by traditional HAL (see fingerprint.h) to
// HIDL-compliant FingerprintError. // HIDL-compliant FingerprintError.
FingerprintError BiometricsFingerprint::VendorErrorFilter(int32_t error, int32_t* vendorCode) { FingerprintError BiometricsFingerprint::VendorErrorFilter(int32_t error, int32_t* vendorCode) {
*vendorCode = 0;
switch (error) { switch (error) {
case FINGERPRINT_ERROR_HW_UNAVAILABLE: case FINGERPRINT_ERROR_HW_UNAVAILABLE:
return FingerprintError::ERROR_HW_UNAVAILABLE; return FingerprintError::ERROR_HW_UNAVAILABLE;
@ -209,7 +208,6 @@ FingerprintError BiometricsFingerprint::VendorErrorFilter(int32_t error, int32_t
// to HIDL-compliant FingerprintAcquiredInfo. // to HIDL-compliant FingerprintAcquiredInfo.
FingerprintAcquiredInfo BiometricsFingerprint::VendorAcquiredFilter(int32_t info, FingerprintAcquiredInfo BiometricsFingerprint::VendorAcquiredFilter(int32_t info,
int32_t* vendorCode) { int32_t* vendorCode) {
*vendorCode = 0;
switch (info) { switch (info) {
case FINGERPRINT_ACQUIRED_GOOD: case FINGERPRINT_ACQUIRED_GOOD:
return FingerprintAcquiredInfo::ACQUIRED_GOOD; return FingerprintAcquiredInfo::ACQUIRED_GOOD;
@ -261,6 +259,7 @@ Return<RequestStatus> BiometricsFingerprint::enroll(const hidl_array<uint8_t, 69
} }
Return<RequestStatus> BiometricsFingerprint::postEnroll() { Return<RequestStatus> BiometricsFingerprint::postEnroll() {
getInstance()->onFingerUp();
return ErrorFilter(ss_fingerprint_post_enroll()); return ErrorFilter(ss_fingerprint_post_enroll());
} }
@ -270,6 +269,7 @@ Return<uint64_t> BiometricsFingerprint::getAuthenticatorId() {
Return<RequestStatus> BiometricsFingerprint::cancel() { Return<RequestStatus> BiometricsFingerprint::cancel() {
int32_t ret = ss_fingerprint_cancel(); int32_t ret = ss_fingerprint_cancel();
getInstance()->onFingerUp();
#ifdef CALL_NOTIFY_ON_CANCEL #ifdef CALL_NOTIFY_ON_CANCEL
if (ret == 0) { if (ret == 0) {
@ -440,13 +440,13 @@ void BiometricsFingerprint::notify(const fingerprint_msg_t* msg) {
const uint8_t* hat = reinterpret_cast<const uint8_t*>(&msg->data.authenticated.hat); const uint8_t* hat = reinterpret_cast<const uint8_t*>(&msg->data.authenticated.hat);
const hidl_vec<uint8_t> token( const hidl_vec<uint8_t> token(
std::vector<uint8_t>(hat, hat + sizeof(msg->data.authenticated.hat))); std::vector<uint8_t>(hat, hat + sizeof(msg->data.authenticated.hat)));
set(HBM_PATH, "0");
if (!thisPtr->mClientCallback if (!thisPtr->mClientCallback
->onAuthenticated(devId, msg->data.authenticated.finger.fid, ->onAuthenticated(devId, msg->data.authenticated.finger.fid,
msg->data.authenticated.finger.gid, token) msg->data.authenticated.finger.gid, token)
.isOk()) { .isOk()) {
LOG(ERROR) << "failed to invoke fingerprint onAuthenticated callback"; LOG(ERROR) << "failed to invoke fingerprint onAuthenticated callback";
} }
getInstance()->onFingerUp();
} else { } else {
// Not a recognized fingerprint // Not a recognized fingerprint
if (!thisPtr->mClientCallback if (!thisPtr->mClientCallback

Loading…
Cancel
Save