Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39988e32 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "servicemanager: preload vintf manifest" am: bd1bb497 am: d965b134

am: 061df1d9

Change-Id: I3fcbe29044048054eca46259860a9cb6ddbc0248
parents d3df1b34 061df1d9
Loading
Loading
Loading
Loading
+9 −1
Original line number Original line Diff line number Diff line
@@ -68,7 +68,15 @@ static bool meetsDeclarationRequirements(const sp<IBinder>& binder, const std::s
}
}
#endif  // !VENDORSERVICEMANAGER
#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() {
ServiceManager::~ServiceManager() {
    // this should only happen in tests
    // this should only happen in tests