Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70dc5ced authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "binder: replace android_atomic_add with std::atomic" into main am: 37961ec0 am: d256dae0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3207836



Change-Id: Iaddd1587121cf43dc7cee5c7d224d2543374835a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30deb8c3 d256dae0

libs/binder/ProcessState.cpp

+1 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <binder/IPCThreadState.h>

#include <binder/IServiceManager.h>

#include <binder/Stability.h>

#include <cutils/atomic.h>

#include <utils/AndroidThreads.h>

#include <utils/String8.h>

#include <utils/Thread.h>
@@ -387,7 +386,7 @@ void ProcessState::expungeHandle(int32_t handle, IBinder* binder) 
}



String8 ProcessState::makeBinderThreadName() {

    int32_t s = android_atomic_add(1, &mThreadPoolSeq);

    int32_t s = mThreadPoolSeq.fetch_add(1, std::memory_order_release);

    pid_t pid = getpid();



    std::string_view driverName = mDriverName.c_str();

libs/binder/include/binder/ProcessState.h

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ private: 


    bool mForked;

    std::atomic_bool mThreadPoolStarted;

    volatile int32_t mThreadPoolSeq;

    std::atomic_int32_t mThreadPoolSeq;



    CallRestriction mCallRestriction;

};