commit d965b134f17d9cf4bcd64c09cb1d5b920eb21820
author Steven Moreland <smoreland@google.com> Mon Nov 18 16:51:47 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 18 16:51:47 2019 -0800
tree cf8e6efb17c37eb6f4c5912530a568cb2d020d42
parent 0376fad03bfe3aa5c9c0f1b9e5864a0769889b8e
parent bd1bb497b7968edc680a62aa772acf09304e32a6

Merge "servicemanager: preload vintf manifest"
am: bd1bb497b7

Change-Id: Id10426c3ba9c2b4c0b99f434f2428bc7e0437d57

cmds/servicemanager/ServiceManager.cpp

diff --git a/cmds/servicemanager/ServiceManager.cpp b/cmds/servicemanager/ServiceManager.cpp
index 861401c..2d2af3c 100644
--- a/cmds/servicemanager/ServiceManager.cpp
+++ b/cmds/servicemanager/ServiceManager.cpp
@@ -68,7 +68,15 @@
 }
 #endif  // !VENDORSERVICEMANAGER
 
-ServiceManager::ServiceManager(std::unique_ptr<Access>&& access) : mAccess(std::move(access)) {}
+ServiceManager::ServiceManager(std::unique_ptr<Access>&& access) : mAccess(std::move(access)) {
+#ifndef VENDORSERVICEMANAGER
+    // can process these at any times, don't want to delay first VINTF client
+    std::thread([] {
+        vintf::VintfObject::GetDeviceHalManifest();
+        vintf::VintfObject::GetFrameworkHalManifest();
+    }).detach();
+#endif  // !VENDORSERVICEMANAGER
+}
 ServiceManager::~ServiceManager() {
     // this should only happen in tests