commit 1de48a256fa9f754d3171e90345cb6d2db25baba
author Tomasz Wasilczyk <twasilczyk@google.com> Mon Oct 30 14:19:19 2023 +0000
committer Tomasz Wasilczyk <twasilczyk@google.com> Sat Nov 04 10:44:30 2023 -0700
tree 36e710575409f7cc72dc159c4514c08f67c4aee9
parent 6c7467787a3f2d5d2228837dada5be137633667f

Revert^2 "Use std::unique_ptr instead of ScopeGuard"

25c1a3b8543dd1756308424dd65030f90bb7a99f

Test: m
Bug: 302723053
Change-Id: Id9355c10d78d0c55afb49f512b78bb0923fbc4f7

libs/binder/FdTrigger.cpp

diff --git a/libs/binder/FdTrigger.cpp b/libs/binder/FdTrigger.cpp
index 37c21bb..a1fbbf3 100644
--- a/libs/binder/FdTrigger.cpp
+++ b/libs/binder/FdTrigger.cpp
@@ -21,13 +21,15 @@
 
 #include <poll.h>
 
-#include <android-base/scopeguard.h>
+#include <binder/Functional.h>
 
 #include "RpcState.h"
 #include "Utils.h"
 
 namespace android {
 
+using namespace android::binder::impl;
+
 std::unique_ptr<FdTrigger> FdTrigger::make() {
     auto ret = std::make_unique<FdTrigger>();
 #ifndef BINDER_RPC_SINGLE_THREADED
@@ -75,8 +77,7 @@
                         "Only one thread should be polling on Fd!");
 
     transportFd.setPollingState(true);
-    auto pollingStateGuard =
-            android::base::make_scope_guard([&]() { transportFd.setPollingState(false); });
+    auto pollingStateGuard = make_scope_guard([&]() { transportFd.setPollingState(false); });
 
     int ret = TEMP_FAILURE_RETRY(poll(pfd, countof(pfd), -1));
     if (ret < 0) {