summaryrefslogtreecommitdiff
path: root/cmds/servicemanager/ServiceManager.cpp
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-11-16 05:05:43 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2022-11-16 05:05:43 +0000
commit3e49ad4d13369ce744ad1e94c87b040eb08beebe (patch)
tree95475502847bfda1c958f646c17ccd33cb25463d /cmds/servicemanager/ServiceManager.cpp
parenta8c0dd747c7aa7127d0bf0f53bcea5ac955b8339 (diff)
parentce94b75b68df3e07e9c73d42eaa59cfce0929e53 (diff)
Merge "servicemanager: add tests for updatable-via-apex"
Diffstat (limited to 'cmds/servicemanager/ServiceManager.cpp')
-rw-r--r--cmds/servicemanager/ServiceManager.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/servicemanager/ServiceManager.cpp b/cmds/servicemanager/ServiceManager.cpp
index 2ae61b9603..cc038ae0d4 100644
--- a/cmds/servicemanager/ServiceManager.cpp
+++ b/cmds/servicemanager/ServiceManager.cpp
@@ -136,6 +136,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
});
@@ -154,7 +155,7 @@ static std::vector<std::string> getVintfUpdatableInstances(const std::string& ap
manifestInstance.interface() + "/" + manifestInstance.instance();
instances.push_back(aname);
}
- return false; // continue
+ return true; // continue (libvintf uses opposite convention)
});
return false; // continue
});