diff options
| author | 2018-06-07 13:12:17 -0700 | |
|---|---|---|
| committer | 2018-06-07 13:12:17 -0700 | |
| commit | 9ca51567f613985db9125407d741c9e298f1d459 (patch) | |
| tree | 75a6e9b5d62e027161e5c1a69479c701a7441868 | |
| parent | 61f2f02d8b9132b7fa0ce6215798947ad4ad4f78 (diff) | |
| parent | 0500dc6337d6a2335c7be1a55d139d190b994d83 (diff) | |
Merge "libbinder: fix using destroyed mutex warning." into pi-dev
am: 0500dc6337
Change-Id: I0024f9f932a9e95bf607fe2041a32754f828033f
| -rw-r--r-- | libs/binder/Static.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/include/private/binder/Static.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/Static.cpp b/libs/binder/Static.cpp index df0fcaed1f..bd0e6f9a11 100644 --- a/libs/binder/Static.cpp +++ b/libs/binder/Static.cpp @@ -72,7 +72,7 @@ TextOutput& aerr(gStderrTextOutput); // ------------ 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 6ca75926a4..171be7791e 100644 --- a/libs/binder/include/private/binder/Static.h +++ b/libs/binder/include/private/binder/Static.h @@ -32,7 +32,7 @@ namespace android { extern Vector<int32_t> gTextBuffers; // For ProcessState.cpp -extern Mutex gProcessMutex; +extern Mutex& gProcessMutex; extern sp<ProcessState> gProcess; // For IServiceManager.cpp |