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

Commit 3158118b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: RPC flake mode fix" am: e9d9b27a 

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

Change-Id: Icd3276a6b2cd4db14aaf5f5ec2511c984ac2017a
parents 3ecfed45 e9d9b27a

libs/binder/RpcState.cpp

+3 −4
Original line number Original line Diff line number Diff line
@@ -34,11 +34,10 @@ namespace android { 




using base::ScopeGuard;

using base::ScopeGuard;





#ifdef RPC_FLAKE_PRONE

#if RPC_FLAKE_PRONE

void rpcMaybeWaitToFlake() {

void rpcMaybeWaitToFlake() {

    static std::random_device r;

    [[clang::no_destroy]] static std::random_device r;

    static std::mutex m;

    [[clang::no_destroy]] static std::mutex m;



    unsigned num;

    unsigned num;

    {

    {

        std::lock_guard<std::mutex> lock(m);

        std::lock_guard<std::mutex> lock(m);

libs/binder/RpcState.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ struct RpcWireHeader; 




#define RPC_FLAKE_PRONE false

#define RPC_FLAKE_PRONE false





#ifdef RPC_FLAKE_PRONE

#if RPC_FLAKE_PRONE

void rpcMaybeWaitToFlake();

void rpcMaybeWaitToFlake();

#define MAYBE_WAIT_IN_FLAKE_MODE rpcMaybeWaitToFlake()

#define MAYBE_WAIT_IN_FLAKE_MODE rpcMaybeWaitToFlake()

#else

#else