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

Commit 9653c9cf authored by Josh Gao's avatar Josh Gao
Browse files

adbd_auth: don't abort on unexpected response. 

There seems to be an additional underlying bug that causes the framework
to send a spurious authentication denial, but this is still an
improvement.

Bug: http://b/159061108
Test: treehugger
Change-Id: I7028292fbde157f02cc35c3a37ab5c49d68eaae6
parent 9e933c54

libs/adbd_auth/adbd_auth.cpp

+11 −5
Original line number Diff line number Diff line
@@ -206,12 +206,18 @@ public: 
    void AllowUsbDevice(std::string_view buf) EXCLUDES(mutex_) {

        std::lock_guard<std::mutex> lock(mutex_);

        CHECK(buf.empty());

        CHECK(dispatched_prompt_.has_value());



        if (dispatched_prompt_.has_value()) {

            // It's possible for the framework to send us a response without our having sent a

            // request to it: e.g. if adbd restarts while we have a pending request.

            auto& [id, key, arg] = *dispatched_prompt_;

            keys_.emplace(id, std::move(key));



            callbacks_.key_authorized(arg, id);

            dispatched_prompt_ = std::nullopt;

        } else {

            LOG(WARNING) << "adbd_auth: received authorization for unknown prompt, ignoring";

        }



        // We need to dispatch pending prompts here upon success as well,

        // since we might have multiple queued prompts.