diff options
| author | 2023-10-31 15:42:02 +0000 | |
|---|---|---|
| committer | 2023-10-31 15:42:02 +0000 | |
| commit | 156adea4c135c99a3876fbd9fbe368fb42a33787 (patch) | |
| tree | 93e959405b761eac3fe08bef7b2ee20e52e5680a /libs/binder/ProcessState.cpp | |
| parent | 1e70a97ba7354de7dd28927841a7417e86e7d7b1 (diff) | |
| parent | 29c9a960a13812f87d1b8341dc397d4496890a50 (diff) | |
Merge "Binder: migrate off libutils Mutex" into main am: 29c9a960a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2807154
Change-Id: I75f32c87d7a4b81f1cd454c5f6b398aff2b1da4c
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp index 8ec4af9945..58203c1373 100644 --- a/libs/binder/ProcessState.cpp +++ b/libs/binder/ProcessState.cpp @@ -189,7 +189,7 @@ void ProcessState::childPostFork() { void ProcessState::startThreadPool() { - AutoMutex _l(mLock); + std::unique_lock<std::mutex> _l(mLock); if (!mThreadPoolStarted) { if (mMaxThreads == 0) { // see also getThreadPoolMaxTotalThreadCount @@ -203,7 +203,7 @@ void ProcessState::startThreadPool() bool ProcessState::becomeContextManager() { - AutoMutex _l(mLock); + std::unique_lock<std::mutex> _l(mLock); flat_binder_object obj { .flags = FLAT_BINDER_FLAG_TXN_SECURITY_CTX, @@ -310,7 +310,7 @@ sp<IBinder> ProcessState::getStrongProxyForHandle(int32_t handle) { sp<IBinder> result; - AutoMutex _l(mLock); + std::unique_lock<std::mutex> _l(mLock); if (handle == 0 && the_context_object != nullptr) return the_context_object; @@ -374,7 +374,7 @@ sp<IBinder> ProcessState::getStrongProxyForHandle(int32_t handle) void ProcessState::expungeHandle(int32_t handle, IBinder* binder) { - AutoMutex _l(mLock); + std::unique_lock<std::mutex> _l(mLock); handle_entry* e = lookupHandleLocked(handle); |