diff options
| author | 2023-11-05 21:00:59 +0000 | |
|---|---|---|
| committer | 2023-11-05 21:00:59 +0000 | |
| commit | d6ca48dcabaffd2e24d0deb6c45e674ce65cbe0d (patch) | |
| tree | c3da84a66dfaf2186d6958d886eac462fc1cf082 /libs/binder/ProcessState.cpp | |
| parent | 91174e23170452d88aad185edf48f79d3b9fb03a (diff) | |
| parent | dc0f937ddfb068670a0c8ea3d32d0d0247b641e0 (diff) | |
Merge changes from topic "revert-2807644-revert-2780893-XRITMVSTFB-ZYEEKMIRIQ" into main am: dc0f937ddf
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2809894
Change-Id: I0718e57bd8b0187325595e7a0f38748d2e5aba21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/binder/ProcessState.cpp')
| -rw-r--r-- | libs/binder/ProcessState.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp index 7af2845f5d..0344eb04d6 100644 --- a/libs/binder/ProcessState.cpp +++ b/libs/binder/ProcessState.cpp @@ -18,9 +18,9 @@ #include <binder/ProcessState.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,6 +60,8 @@ const char* kDefaultDriver = "/dev/binder"; namespace android { +using namespace android::binder::impl; + class PoolThread : public Thread { public: @@ -430,7 +432,7 @@ status_t ProcessState::setThreadPoolMaxThreadCount(size_t maxThreads) { size_t ProcessState::getThreadPoolMaxTotalThreadCount() const { pthread_mutex_lock(&mThreadCountLock); - base::ScopeGuard detachGuard = [&]() { pthread_mutex_unlock(&mThreadCountLock); }; + auto detachGuard = make_scope_guard([&]() { pthread_mutex_unlock(&mThreadCountLock); }); if (mThreadPoolStarted) { LOG_ALWAYS_FATAL_IF(mKernelStartedThreads > mMaxThreads + 1, |