commit f65d49a9a7c990094db65c609903e3b807b6311e
author Steven Moreland <smoreland@google.com> Wed Apr 22 00:56:44 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 22 00:56:44 2020 +0000
tree b903a0642251c782186182f2454853171917255a
parent 330d0f83971c0ad157216a9272ca780cc4c82468
parent 441c5d6a2730921ebc9ccbd8085105cbe5d5d84c

Avoid deallocating hwsm statics during shutdown. am: c63f0320c6 am: 441c5d6a27

Change-Id: Ic5bbcfaa7ade40a5f057bfa0590ecfafc30504c1

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);