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

Commit e219a754 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "lshal: use new libvintf API" am: d0947e88 am: ceeb5e10 am: 2da8a255 

am: d27b50e7

Change-Id: I40ac5af99368e57d494dc3c10a0528e07187ddb9
parents bf07761b d27b50e7

cmds/lshal/ListCommand.cpp

+8 −8
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ template <typename ObjectType> 
VintfInfo getVintfInfo(const std::shared_ptr<const ObjectType>& object,

                       const FqInstance& fqInstance, vintf::TransportArch ta, VintfInfo value) {

    bool found = false;

    (void)object->forEachInstanceOfVersion(fqInstance.getPackage(), fqInstance.getVersion(),

    (void)object->forEachHidlInstanceOfVersion(fqInstance.getPackage(), fqInstance.getVersion(),

                                               [&](const auto& instance) {

                                                   found = match(instance, fqInstance, ta);

                                                   return !found; // continue if not found
@@ -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<std::string, TableEntry> 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.