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

Commit 97649ae4 authored by Hao Chen's avatar Hao Chen Committed by Tomasz Wasilczyk
Browse files

Add missing "override" annotations 

Test: Build with CMake. See aosp/2629369.
Bug: 285204695
Change-Id: I5a0396d1fba458e11f42266e806634aaa1e9206d
parent 3a0a27af

libs/binder/RpcTransportRaw.cpp

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

                                        altPoll);

    }

    }





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

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





private:

private:

    android::RpcTransportFd mSocket;

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

// RpcTransportCtx with TLS disabled.

class RpcTransportCtxRaw : public RpcTransportCtx {

class RpcTransportCtxRaw : public RpcTransportCtx {

public:

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

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

    }

    }

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

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

libs/binder/RpcTransportTls.cpp

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

            const std::optional<android::base::function_ref<status_t()>>& altPoll,

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

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





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

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





private:

private:

    android::RpcTransportFd mSocket;

    android::RpcTransportFd mSocket;