diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-23 01:06:59 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-23 01:06:59 +0000 |
| commit | b60764f7b77d3588d655be043c2b6b06f86ff5ef (patch) | |
| tree | b903a0642251c782186182f2454853171917255a | |
| parent | ede3185458c9a0622cdb1d50f99c64c7f3c2a173 (diff) | |
| parent | c63f0320c67917c5b043e1937517c946f644d6d4 (diff) | |
| download | platform_system_libhidl-b60764f7b77d3588d655be043c2b6b06f86ff5ef.tar.gz platform_system_libhidl-b60764f7b77d3588d655be043c2b6b06f86ff5ef.tar.bz2 platform_system_libhidl-b60764f7b77d3588d655be043c2b6b06f86ff5ef.zip | |
Snap for 6420265 from c63f0320c67917c5b043e1937517c946f644d6d4 to rvc-release
Change-Id: I90d137225a7f8c7217704d3bf29f014d62d87a1c
| -rw-r--r-- | transport/ServiceManagement.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp index 36010167..d7faa6db 100644 --- a/transport/ServiceManagement.cpp +++ b/transport/ServiceManagement.cpp @@ -209,8 +209,8 @@ sp<IServiceManager1_2> defaultServiceManager1_2() { using android::hidl::manager::V1_2::BnHwServiceManager; using android::hidl::manager::V1_2::BpHwServiceManager; - static std::mutex gDefaultServiceManagerLock; - static sp<IServiceManager1_2> gDefaultServiceManager; + static std::mutex& gDefaultServiceManagerLock = *new std::mutex; + static sp<IServiceManager1_2>& gDefaultServiceManager = *new sp<IServiceManager1_2>; { std::lock_guard<std::mutex> _l(gDefaultServiceManagerLock); |