Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a52f445 authored by Jeff Pu's avatar Jeff Pu Committed by Automerger Merge Worker
Browse files

Merge "HAT validity check should be performed early" into udc-qpr-dev am: bdf9c891 am: dfdb6c5e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24225175



Change-Id: Iaca7f78ee0bc58ca1cdcbdb3f507aabb583ab61d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42377b47 dfdb6c5e

biometrics/fingerprint/aidl/default/FakeFingerprintEngine.cpp

+9 −8
Original line number Diff line number Diff line
@@ -52,6 +52,14 @@ void FakeFingerprintEngine::enrollImpl(ISessionCallback* cb, 
                                       const keymaster::HardwareAuthToken& hat,

                                       const std::future<void>& cancel) {

    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);

}
@@ -112,17 +120,10 @@ void FakeFingerprintEngine::fingerDownAction() { 
}



bool FakeFingerprintEngine::onEnrollFingerDown(ISessionCallback* cb,

                                               const keymaster::HardwareAuthToken& hat,

                                               const keymaster::HardwareAuthToken&,

                                               const std::future<void>& cancel) {

    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

    auto err = FingerprintHalProperties::operation_enroll_error().value_or(0);

    if (err != 0) {