summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hao Chen <chenhaosjtuacm@google.com> 2023-05-31 14:12:33 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> 2023-10-06 17:51:17 +0000
commit97649ae47084a1c76e0bdc8c35956741dfc3a985 (patch)
tree115db7b44d9d4f8713851eaa8a7ff6fb0d75fab6
parent3a0a27af82d79861e1e2b5f6ab9ade4b50f93485 (diff)
Add missing "override" annotations
Test: Build with CMake. See aosp/2629369. Bug: 285204695 Change-Id: I5a0396d1fba458e11f42266e806634aaa1e9206d
-rw-r--r--libs/binder/RpcTransportRaw.cpp5
-rw-r--r--libs/binder/RpcTransportTls.cpp2
2 files changed, 4 insertions, 3 deletions
diff --git a/libs/binder/RpcTransportRaw.cpp b/libs/binder/RpcTransportRaw.cpp
index f3575cc7d8..ddbcb573b1 100644
--- a/libs/binder/RpcTransportRaw.cpp
+++ b/libs/binder/RpcTransportRaw.cpp
@@ -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 {}; }
diff --git a/libs/binder/RpcTransportTls.cpp b/libs/binder/RpcTransportTls.cpp
index 785f6ce2ce..efb09e9004 100644
--- a/libs/binder/RpcTransportTls.cpp
+++ b/libs/binder/RpcTransportTls.cpp
@@ -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;