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

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

Fix minor version bump reflected in lshal --init-vintf 

Test: lshal --init-vintf has no warnings, and power@1.1 / vibrator@1.1
      is shown in output.

Bug: 62675393
Change-Id: I1ffd8b6dc7fcadcf7228cf2b8838e918bb3afe6b
Merged-In: I1ffd8b6dc7fcadcf7228cf2b8838e918bb3afe6b
parent 5cf813ee

cmds/lshal/ListCommand.cpp

+14 −2
Original line number Diff line number Diff line
@@ -244,6 +244,16 @@ void ListCommand::printLine( 
    mOut << std::endl;

}



static inline bool findAndBumpVersion(vintf::ManifestHal* hal, const vintf::Version& version) {

    for (vintf::Version& v : hal->versions) {

        if (v.majorVer == version.majorVer) {

            v.minorVer = std::max(v.minorVer, version.minorVer);

            return true;

        }

    }

    return false;

}



void ListCommand::dumpVintf() const {

    using vintf::operator|=;

    mOut << "<!-- " << std::endl
@@ -253,7 +263,9 @@ void ListCommand::dumpVintf() const { 
         << "       only hwbinder is shown." << std::endl

         << "    3. It is likely that HALs in passthrough transport does not have" << std::endl

         << "       <interface> declared; users will have to write them by hand." << std::endl

         << "    4. sepolicy version is set to 0.0. It is recommended that the entry" << std::endl

         << "    4. A HAL with lower minor version can be overridden by a HAL with" << std::endl

         << "       higher minor version if they have the same name and major version." << std::endl

         << "    5. sepolicy version is set to 0.0. It is recommended that the entry" << std::endl

         << "       is removed from the manifest file and written by assemble_vintf" << std::endl

         << "       at build time." << std::endl

         << "-->" << std::endl;
@@ -324,7 +336,7 @@ void ListCommand::dumpVintf() const { 
                    done = true;

                    break;

                }

                if (hal->hasVersion(version)) {

                if (findAndBumpVersion(hal, version)) {

                    if (&table != &mImplementationsTable) {

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

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