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

Commit cb8c2b42 authored by Yifan Hong's avatar Yifan Hong
Browse files

Fix lshal --init-vintf may have empty <instance> tags. 

Test: on bullhead, lshal --init-vintf | grep "<instance></instance>"

Change-Id: Ic6ab977adcdc5293015e9daba506b625629e5352
Fixes: 37311367
parent 9014ca88

cmds/lshal/Lshal.cpp

+10 −3
Original line number Original line Diff line number Diff line
@@ -322,8 +322,10 @@ void Lshal::dumpVintf() const { 
                    break;

                    break;

                }

                }

                if (hal->hasVersion(version)) {

                if (hal->hasVersion(version)) {

                    if (&table != &mImplementationsTable) {

                        hal->interfaces[interfaceName].name = interfaceName;

                        hal->interfaces[interfaceName].name = interfaceName;

                        hal->interfaces[interfaceName].instances.insert(instanceName);

                        hal->interfaces[interfaceName].instances.insert(instanceName);

                    }

                    done = true;

                    done = true;

                    break;

                    break;

                }

                }
@@ -331,12 +333,17 @@ void Lshal::dumpVintf() const { 
            if (done) {

            if (done) {

                continue; // to next TableEntry

                continue; // to next TableEntry

            }

            }

            decltype(vintf::ManifestHal::interfaces) interfaces;

            if (&table != &mImplementationsTable) {

                interfaces[interfaceName].name = interfaceName;

                interfaces[interfaceName].instances.insert(instanceName);

            }

            if (!manifest.add(vintf::ManifestHal{

            if (!manifest.add(vintf::ManifestHal{

                    .format = vintf::HalFormat::HIDL,

                    .format = vintf::HalFormat::HIDL,

                    .name = fqName.package(),

                    .name = fqName.package(),

                    .versions = {version},

                    .versions = {version},

                    .transportArch = {transport, arch},

                    .transportArch = {transport, arch},

                    .interfaces = {{interfaceName, {interfaceName, {{instanceName}}}}}})) {

                    .interfaces = interfaces})) {

                mErr << "Warning: cannot add hal '" << fqInstanceName << "'" << std::endl;

                mErr << "Warning: cannot add hal '" << fqInstanceName << "'" << std::endl;

            }

            }

        }

        }