commit 061df1d9894a9466f54ca1389cbb91928810723a
author Steven Moreland <smoreland@google.com> Mon Nov 18 16:54:55 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 18 16:54:55 2019 -0800
tree f1084087d32f7310d0f023e322087482e425f6ef
parent bf7cd4304b4192e1926dbc12f4ffa453c3ef0a8a
parent d965b134f17d9cf4bcd64c09cb1d5b920eb21820

Merge "servicemanager: preload vintf manifest" am: bd1bb497b7
am: d965b134f1

Change-Id: If00f5f608f1531ce349c8b8b8c70ca949dca7e49

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