diff options
| author | Yabin Cui <yabinc@google.com> | 2018-06-07 19:06:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-07 19:06:39 +0000 |
| commit | 0500dc6337d6a2335c7be1a55d139d190b994d83 (patch) | |
| tree | d1251a37b9b998b56f86a3ad51904dcabd624b66 | |
| parent | b46d5b2d82b021db41a72f4c3eb9250f8a839e04 (diff) | |
| parent | c39caf36da9999c4b61ec8898f8735dcce7fd199 (diff) | |
| download | native-0500dc6337d6a2335c7be1a55d139d190b994d83.tar.gz | |
Merge "libbinder: fix using destroyed mutex warning." into pi-dev
| -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 c5c3fd58c3..d6d0340a36 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; class LibBinderIPCtStatics 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 |