commit 25c1a3b8543dd1756308424dd65030f90bb7a99f
author Sebastian Pickl <spickl@google.com> Mon Oct 30 08:02:24 2023 +0000
committer Sebastian Pickl <spickl@google.com> Mon Oct 30 11:26:22 2023 +0000
tree 47483af2f39a1ff2d26442658ff43f0de44c70ac
parent 84b7cff1a7082d32e9043014e57db7b4ed2aa7a0

Revert "Use std::unique_ptr instead of ScopeGuard"

Revert submission 2780893

Reason for revert: breaking boot tests

Bug: 308214260

Reverted changes: /q/submissionid:2780893

Change-Id: I7a4ee9a45583a8a1d4a33447de55c63e6ce9d42a

libs/binder/FdTrigger.cpp

diff --git a/libs/binder/FdTrigger.cpp b/libs/binder/FdTrigger.cpp
index 49a0cee..8ee6cb0 100644
--- a/libs/binder/FdTrigger.cpp
+++ b/libs/binder/FdTrigger.cpp
@@ -22,13 +22,11 @@
 #include <poll.h>
 
 #include <android-base/macros.h>
-#include <binder/Functional.h>
+#include <android-base/scopeguard.h>
 
 #include "RpcState.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
@@ -76,7 +74,8 @@
                         "Only one thread should be polling on Fd!");
 
     transportFd.setPollingState(true);
-    auto pollingStateGuard = make_scope_guard([&]() { transportFd.setPollingState(false); });
+    auto pollingStateGuard =
+            android::base::make_scope_guard([&]() { transportFd.setPollingState(false); });
 
     int ret = TEMP_FAILURE_RETRY(poll(pfd, arraysize(pfd), -1));
     if (ret < 0) {