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

Commit 9f1c687f authored by Jooyung Han's avatar Jooyung Han
Browse files

servicemanager: Fix loop continue/break 

in getVintfUpdatableApex, it can break out the outer loop if the nested
forEach find a match.

Bug: n/a
Test: TH
Change-Id: I0261a2d43156a563e9e7fd7e96f89544c0f0fd50
parent d52639e3

cmds/servicemanager/ServiceManager.cpp

+2 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static std::optional<std::string> getVintfUpdatableApex(const std::string& name) 
    std::optional<std::string> updatableViaApex;



    forEachManifest([&](const ManifestWithDescription& mwd) {

        mwd.manifest->forEachInstance([&](const auto& manifestInstance) {

        bool cont = mwd.manifest->forEachInstance([&](const auto& manifestInstance) {

            if (manifestInstance.format() != vintf::HalFormat::AIDL) return true;

            if (manifestInstance.package() != aname.package) return true;

            if (manifestInstance.interface() != aname.iface) return true;
@@ -158,8 +158,7 @@ static std::optional<std::string> getVintfUpdatableApex(const std::string& name) 
            updatableViaApex = manifestInstance.updatableViaApex();

            return false; // break (libvintf uses opposite convention)

        });

        if (updatableViaApex.has_value()) return true; // break (found match)

        return false; // continue

        return !cont;

    });



    return updatableViaApex;