commit c8a0c5409a3d0b1cea17f94a7c86d3ab8b48454c
author Steven Moreland <smoreland@google.com> Tue Apr 21 23:37:12 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 21 23:37:12 2020 +0000
tree 9da1561e0c1a68c16aaa8fb44c973d05ebab99a7
parent ca31389e124fcd619c05f9e6963cac00ddb11b04
parent c68e00b8a79ad28847020e03409b686ee5f5d616

Avoid deallocating hwsm statics during shutdown. am: 10d5563f5c am: c68e00b8a7

Change-Id: I58c596cf75881aa02bce7ac06b6403d7e2f11f84

transport/ServiceManagement.cpp

diff --git a/transport/ServiceManagement.cpp b/transport/ServiceManagement.cpp
index 3601016..d7faa6d 100644
--- a/transport/ServiceManagement.cpp
+++ b/transport/ServiceManagement.cpp
@@ -209,8 +209,8 @@
     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);