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

Commit 2995a683 authored by Jeff Pu's avatar Jeff Pu Committed by Android (Google) Code Review
Browse files

Merge "Handle multiple cancel calls from HAL client" into main

parents f5530222 87c833fb

biometrics/common/util/CancellationSignal.cpp

+5 −2
Original line number Diff line number Diff line
@@ -22,10 +22,13 @@ 
namespace aidl::android::hardware::biometrics {



CancellationSignal::CancellationSignal(std::promise<void>&& cancellationPromise)

    : mCancellationPromise(std::move(cancellationPromise)) {}

    : mCancellationPromise(std::move(cancellationPromise)), isSet(false) {}



ndk::ScopedAStatus CancellationSignal::cancel() {

    if (!isSet) {

        mCancellationPromise.set_value();

        isSet = true;

    }

    return ndk::ScopedAStatus::ok();

}

biometrics/common/util/include/util/CancellationSignal.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ class CancellationSignal : public common::BnCancellationSignal { 


  private:

    std::promise<void> mCancellationPromise;

    bool isSet;

};



// Returns whether the given cancellation future is ready, i.e. whether the operation corresponding