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/RpcTransportTipcAndroid.cpp

diff --git a/libs/binder/RpcTransportTipcAndroid.cpp b/libs/binder/RpcTransportTipcAndroid.cpp
index 3d26a3d..188ba3b 100644
--- a/libs/binder/RpcTransportTipcAndroid.cpp
+++ b/libs/binder/RpcTransportTipcAndroid.cpp
@@ -26,6 +26,8 @@
 #include "RpcState.h"
 #include "RpcTransportUtils.h"
 
+using namespace android::binder::impl;
+
 namespace android {
 
 // RpcTransport for writing Trusty IPC clients in Android.
@@ -72,7 +74,7 @@
 
     status_t interruptableWriteFully(
             FdTrigger* fdTrigger, iovec* iovs, int niovs,
-            const std::optional<android::base::function_ref<status_t()>>& altPoll,
+            const std::optional<SmallFunction<status_t()>>& altPoll,
             const std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* ancillaryFds)
             override {
         auto writeFn = [&](iovec* iovs, size_t niovs) -> ssize_t {
@@ -90,7 +92,7 @@
 
     status_t interruptableReadFully(
             FdTrigger* fdTrigger, iovec* iovs, int niovs,
-            const std::optional<android::base::function_ref<status_t()>>& altPoll,
+            const std::optional<SmallFunction<status_t()>>& altPoll,
             std::vector<std::variant<base::unique_fd, base::borrowed_fd>>* /*ancillaryFds*/)
             override {
         auto readFn = [&](iovec* iovs, size_t niovs) -> ssize_t {