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

Commit dae3be64 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: fix flake-mode build" am: ba056744 am: f4a02f34 

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



Change-Id: Ife24987df6bb3433d6e67a82ea927efc90832072
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 992e9ef4 f4a02f34

libs/binder/RpcState.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ using base::StringPrintf; 
#if RPC_FLAKE_PRONE

#if RPC_FLAKE_PRONE

void rpcMaybeWaitToFlake() {

void rpcMaybeWaitToFlake() {

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

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

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

    [[clang::no_destroy]] static RpcMutex m;

    unsigned num;

    unsigned num;

    {

    {

        RpcMutexLockGuard lock(m);

        RpcMutexLockGuard lock(m);