commit 35804862d172226835319327457270396dd6d71d
author Tomasz Wasilczyk <twasilczyk@google.com> Mon Oct 30 14:19:19 2023 +0000
committer Tomasz Wasilczyk <twasilczyk@google.com> Sat Nov 04 10:47:51 2023 -0700
tree f79d86a6d691c5b6e6f05ffeb58f184aed740a0e
parent 1de48a256fa9f754d3171e90345cb6d2db25baba

Revert^2 "Use std::function instead of base::function_ref"

84b7cff1a7082d32e9043014e57db7b4ed2aa7a0

Test: m
Bug: 302723053
Change-Id: If25bdb65254a4a8ad5afeda7e6ce1eedf422d896

libs/binder/RpcState.h

diff --git a/libs/binder/RpcState.h b/libs/binder/RpcState.h
index 1fe71a5..2a954e6 100644
--- a/libs/binder/RpcState.h
+++ b/libs/binder/RpcState.h
@@ -16,6 +16,7 @@
 #pragma once
 
 #include <android-base/unique_fd.h>
+#include <binder/Functional.h>
 #include <binder/IBinder.h>
 #include <binder/Parcel.h>
 #include <binder/RpcSession.h>
@@ -190,7 +191,7 @@
     [[nodiscard]] status_t rpcSend(
             const sp<RpcSession::RpcConnection>& connection, const sp<RpcSession>& session,
             const char* what, iovec* iovs, int niovs,
-            const std::optional<android::base::function_ref<status_t()>>& altPoll,
+            const std::optional<binder::impl::SmallFunction<status_t()>>& altPoll,
             const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds =
                     nullptr);
     [[nodiscard]] status_t rpcRec(