commit 082564349e21530a78d569547dea7971a2381562
author Devin Moore <devinmoore@google.com> Fri Jul 02 13:03:49 2021 -0700
committer Steven Moreland <smoreland@google.com> Mon Jul 12 21:09:00 2021 +0000
tree de96c3119245d22b939025a8b9dfceb3238f78bd
parent 2bfbdffc26b4da2670a74b8fef640fa3741ad229

libbinder: RPC flake mode fix

The #ifdef should be #if because RPC_FLAKE_PRONE is defined to false.
[[clang::no_destroy]] is needed for the static variables in
rpcMaybeWaitToFlake otherwise it can crash for taking a mutex that was
destroyed in the onLastStrongRef->sendDecStrong path.

Test: atest binderRpcTest
Fixes: 190828148
Change-Id: Iac6302d737de70f5fde2656dd2e140a6dcd13f7e

libs/binder/RpcState.h

diff --git a/libs/binder/RpcState.h b/libs/binder/RpcState.h
index 8201eba..5ac0b97 100644
--- a/libs/binder/RpcState.h
+++ b/libs/binder/RpcState.h
@@ -44,7 +44,7 @@
 
 #define RPC_FLAKE_PRONE false
 
-#ifdef RPC_FLAKE_PRONE
+#if RPC_FLAKE_PRONE
 void rpcMaybeWaitToFlake();
 #define MAYBE_WAIT_IN_FLAKE_MODE rpcMaybeWaitToFlake()
 #else