Avoid deallocating hwsm statics during shutdown. am: c63f032

Change-Id: I90baec1f7abe417de164e31525afe32a85194618
TeamWin · Apr 22, 2020 · 441c5d6 · 441c5d6
2 parents a4d34a8 + c63f032
commit 441c5d6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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);