commit 0500dc6337d6a2335c7be1a55d139d190b994d83
author Yabin Cui <yabinc@google.com> Thu Jun 07 19:06:39 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 07 19:06:39 2018 +0000
tree d1251a37b9b998b56f86a3ad51904dcabd624b66
parent b46d5b2d82b021db41a72f4c3eb9250f8a839e04
parent c39caf36da9999c4b61ec8898f8735dcce7fd199

Merge "libbinder: fix using destroyed mutex warning." into pi-dev

libs/binder/Static.cpp

diff --git a/libs/binder/Static.cpp b/libs/binder/Static.cpp
index c5c3fd5..d6d0340 100644
--- a/libs/binder/Static.cpp
+++ b/libs/binder/Static.cpp
@@ -72,7 +72,7 @@
 
 // ------------ ProcessState.cpp
 
-Mutex gProcessMutex;
+Mutex& gProcessMutex = *new Mutex;
 sp<ProcessState> gProcess;
 
 class LibBinderIPCtStatics

libs/binder/include/private/binder/Static.h

diff --git a/libs/binder/include/private/binder/Static.h b/libs/binder/include/private/binder/Static.h
index 6ca7592..171be77 100644
--- a/libs/binder/include/private/binder/Static.h
+++ b/libs/binder/include/private/binder/Static.h
@@ -32,7 +32,7 @@
 extern Vector<int32_t> gTextBuffers;
 
 // For ProcessState.cpp
-extern Mutex gProcessMutex;
+extern Mutex& gProcessMutex;
 extern sp<ProcessState> gProcess;
 
 // For IServiceManager.cpp