Merge "lshal: use new libvintf API" am: d0947e8833 am: ceeb5e1046 (d27b50e7) · Commits · e / os / android_frameworks_native

cmds/lshal/ListCommand.cpp

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -163,7 +163,7 @@ template <typename ObjectType>
	VintfInfo getVintfInfo(const std::shared_ptr<const ObjectType>& object,		VintfInfo getVintfInfo(const std::shared_ptr<const ObjectType>& object,
	const FqInstance& fqInstance, vintf::TransportArch ta, VintfInfo value) {		const FqInstance& fqInstance, vintf::TransportArch ta, VintfInfo value) {
	bool found = false;		bool found = false;
	(void)object->forEachInstanceOfVersion(fqInstance.getPackage(), fqInstance.getVersion(),		(void)object->forEachHidlInstanceOfVersion(fqInstance.getPackage(), fqInstance.getVersion(),
	[&](const auto& instance) {		[&](const auto& instance) {
	found = match(instance, fqInstance, ta);		found = match(instance, fqInstance, ta);
	return !found; // continue if not found		return !found; // continue if not found
	@@ -453,7 +453,7 @@ bool ListCommand::addEntryWithoutInstance(const TableEntry& entry,
	}		}

	bool found = false;		bool found = false;
	(void)manifest->forEachInstanceOfVersion(package, version, [&found](const auto&) {		(void)manifest->forEachHidlInstanceOfVersion(package, version, [&found](const auto&) {
	found = true;		found = true;
	return false; // break		return false; // break
	});		});
	@@ -797,9 +797,9 @@ Status ListCommand::fetchManifestHals() {

	std::map<std::string, TableEntry> entries;		std::map<std::string, TableEntry> entries;

	manifest->forEachInstance([&] (const vintf::ManifestInstance& manifestInstance) {		manifest->forEachHidlInstance([&] (const vintf::ManifestInstance& manifestInstance) {
	TableEntry entry{		TableEntry entry{
	.interfaceName = manifestInstance.getFqInstance().string(),		.interfaceName = manifestInstance.description(),
	.transport = manifestInstance.transport(),		.transport = manifestInstance.transport(),
	.arch = manifestInstance.arch(),		.arch = manifestInstance.arch(),
	// TODO(b/71555570): Device manifest does not distinguish HALs from vendor or ODM.		// TODO(b/71555570): Device manifest does not distinguish HALs from vendor or ODM.