Merge "Add missing "override" annotations" into main (3b7bc1dd) · Commits · e / os / android_frameworks_native

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 {}; }

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