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

Commit 40fa81fc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "servicemanager: Fix loop continue/break" into main am: 6c956266 am: 3f31ab45 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2928570



Change-Id: I049ea734662876f07cb0d0005bd29141c2140728
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c36825d3 3f31ab45

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;