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

diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp
index ff8aa83..8ec4af9 100644
--- a/libs/binder/ProcessState.cpp
+++ b/libs/binder/ProcessState.cpp
@@ -19,9 +19,9 @@
 #include <binder/ProcessState.h>
 
 #include <android-base/result.h>
+#include <android-base/scopeguard.h>
 #include <android-base/strings.h>
 #include <binder/BpBinder.h>
-#include <binder/Functional.h>
 #include <binder/IPCThreadState.h>
 #include <binder/IServiceManager.h>
 #include <binder/Stability.h>
@@ -60,8 +60,6 @@
 
 namespace android {
 
-using namespace android::binder::impl;
-
 class PoolThread : public Thread
 {
 public:
@@ -432,7 +430,7 @@
 
 size_t ProcessState::getThreadPoolMaxTotalThreadCount() const {
     pthread_mutex_lock(&mThreadCountLock);
-    auto detachGuard = make_scope_guard([&]() { pthread_mutex_unlock(&mThreadCountLock); });
+    base::ScopeGuard detachGuard = [&]() { pthread_mutex_unlock(&mThreadCountLock); };
 
     if (mThreadPoolStarted) {
         LOG_ALWAYS_FATAL_IF(mKernelStartedThreads > mMaxThreads + 1,