From c346a16e6593ec27307e0a0f642389f4a2d4654c Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 10 Sep 2019 19:35:55 -0700 Subject: lshal: use new libvintf API forEachInstanceOfVersion now requires a HalFormat arg now. Right now, lshal only works on HIDL hals. We will re-visit this code when we need lshal for staidl hals as well. Bug: 140832836 Test: lshal_test Change-Id: I721dff82ec6aeb4473236c5c78694d366893eb30 --- cmds/lshal/ListCommand.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'cmds') diff --git a/cmds/lshal/ListCommand.cpp b/cmds/lshal/ListCommand.cpp index ad7e4c490f..a7ccf64c50 100644 --- a/cmds/lshal/ListCommand.cpp +++ b/cmds/lshal/ListCommand.cpp @@ -163,11 +163,11 @@ template VintfInfo getVintfInfo(const std::shared_ptr& object, const FqInstance& fqInstance, vintf::TransportArch ta, VintfInfo value) { bool found = false; - (void)object->forEachInstanceOfVersion(fqInstance.getPackage(), fqInstance.getVersion(), - [&](const auto& instance) { - found = match(instance, fqInstance, ta); - return !found; // continue if not found - }); + (void)object->forEachHidlInstanceOfVersion(fqInstance.getPackage(), fqInstance.getVersion(), + [&](const auto& instance) { + found = match(instance, fqInstance, ta); + return !found; // continue if not found + }); return found ? value : VINTF_INFO_EMPTY; } @@ -453,7 +453,7 @@ bool ListCommand::addEntryWithoutInstance(const TableEntry& entry, } bool found = false; - (void)manifest->forEachInstanceOfVersion(package, version, [&found](const auto&) { + (void)manifest->forEachHidlInstanceOfVersion(package, version, [&found](const auto&) { found = true; return false; // break }); @@ -797,9 +797,9 @@ Status ListCommand::fetchManifestHals() { std::map entries; - manifest->forEachInstance([&] (const vintf::ManifestInstance& manifestInstance) { + manifest->forEachHidlInstance([&] (const vintf::ManifestInstance& manifestInstance) { TableEntry entry{ - .interfaceName = manifestInstance.getFqInstance().string(), + .interfaceName = manifestInstance.description(), .transport = manifestInstance.transport(), .arch = manifestInstance.arch(), // TODO(b/71555570): Device manifest does not distinguish HALs from vendor or ODM. -- cgit v1.2.3-59-g8ed1b