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

Commit fee64b18 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Add missing "override" annotations" into main am: 3b7bc1dd am:... 

Merge "Add missing "override" annotations" into main am: 3b7bc1dd am: 8b63de41 am: 0e2b254d am: d6f648d3 am: 4a8483fc

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2645615



Change-Id: I77f8825ae0108377fea29ddcdf6802bba4c65596
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ed09b92 4a8483fc

libs/binder/RpcTransportRaw.cpp

+3 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public: 
                                        altPoll);

    }



    virtual bool isWaiting() { return mSocket.isInPollingState(); }

    bool isWaiting() override { return mSocket.isInPollingState(); }



private:

    android::RpcTransportFd mSocket;
@@ -88,7 +88,8 @@ private: 
// RpcTransportCtx with TLS disabled.

class RpcTransportCtxRaw : public RpcTransportCtx {

public:

    std::unique_ptr<RpcTransport> newTransport(android::RpcTransportFd socket, FdTrigger*) const {

    std::unique_ptr<RpcTransport> newTransport(android::RpcTransportFd socket,

                                               FdTrigger*) const override {

        return std::make_unique<RpcTransportRaw>(std::move(socket));

    }

    std::vector<uint8_t> getCertificate(RpcCertificateFormat) const override { return {}; }

libs/binder/RpcTransportTls.cpp

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ public: 
            const std::optional<android::base::function_ref<status_t()>>& altPoll,

            std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds) override;



    bool isWaiting() { return mSocket.isInPollingState(); };

    bool isWaiting() override { return mSocket.isInPollingState(); };



private:

    android::RpcTransportFd mSocket;