| commit | 9ca51567f613985db9125407d741c9e298f1d459 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Thu Jun 07 13:12:17 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 07 13:12:17 2018 -0700 |
| tree | 75a6e9b5d62e027161e5c1a69479c701a7441868 | |
| parent | 61f2f02d8b9132b7fa0ce6215798947ad4ad4f78 [diff] | |
| parent | 0500dc6337d6a2335c7be1a55d139d190b994d83 [diff] |
Merge "libbinder: fix using destroyed mutex warning." into pi-dev am: 0500dc6337 Change-Id: I0024f9f932a9e95bf607fe2041a32754f828033f
diff --git a/libs/binder/Static.cpp b/libs/binder/Static.cpp index df0fcae..bd0e6f9 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; // ------------ IServiceManager.cpp
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