Merge "HAT validity check should be performed early" into udc-qpr-dev

This commit is contained in:
Jeff Pu
2023-07-28 12:37:00 +00:00
committed by Android (Google) Code Review

View File

@@ -52,6 +52,14 @@ void FakeFingerprintEngine::enrollImpl(ISessionCallback* cb,
const keymaster::HardwareAuthToken& hat, const keymaster::HardwareAuthToken& hat,
const std::future<void>& cancel) { const std::future<void>& cancel) {
BEGIN_OP(0); BEGIN_OP(0);
// Do proper HAT verification in the real implementation.
if (hat.mac.empty()) {
LOG(ERROR) << "Fail: hat";
cb->onError(Error::UNABLE_TO_PROCESS, 0 /* vendorError */);
return;
}
updateContext(WorkMode::kEnroll, cb, const_cast<std::future<void>&>(cancel), 0, hat); updateContext(WorkMode::kEnroll, cb, const_cast<std::future<void>&>(cancel), 0, hat);
} }
@@ -112,17 +120,10 @@ void FakeFingerprintEngine::fingerDownAction() {
} }
bool FakeFingerprintEngine::onEnrollFingerDown(ISessionCallback* cb, bool FakeFingerprintEngine::onEnrollFingerDown(ISessionCallback* cb,
const keymaster::HardwareAuthToken& hat, const keymaster::HardwareAuthToken&,
const std::future<void>& cancel) { const std::future<void>& cancel) {
BEGIN_OP(getLatency(FingerprintHalProperties::operation_enroll_latency())); BEGIN_OP(getLatency(FingerprintHalProperties::operation_enroll_latency()));
// Do proper HAT verification in the real implementation.
if (hat.mac.empty()) {
LOG(ERROR) << "Fail: hat";
cb->onError(Error::UNABLE_TO_PROCESS, 0 /* vendorError */);
return true;
}
// Force error-out // Force error-out
auto err = FingerprintHalProperties::operation_enroll_error().value_or(0); auto err = FingerprintHalProperties::operation_enroll_error().value_or(0);
if (err != 0) { if (err != 0) {