Combine forEachInstanceOfVersion
Remove the old variant because it is no longer used.
Test: libvintf_test
Test: vintf_object_test
Bug: 140832836
Change-Id: I92b33b6892c53828c61f5ff5158f7d773e5e1d34
diff --git a/CompatibilityMatrix.cpp b/CompatibilityMatrix.cpp
index 2f215d9..7c52296 100644
--- a/CompatibilityMatrix.cpp
+++ b/CompatibilityMatrix.cpp
@@ -449,11 +449,12 @@
}
bool CompatibilityMatrix::forEachInstanceOfVersion(
- const std::string& package, const Version& expectVersion,
+ HalFormat format, const std::string& package, const Version& expectVersion,
const std::function<bool(const MatrixInstance&)>& func) const {
for (const MatrixHal* hal : getHals(package)) {
bool cont = hal->forEachInstance([&](const MatrixInstance& matrixInstance) {
- if (matrixInstance.versionRange().contains(expectVersion)) {
+ if (matrixInstance.format() == format &&
+ matrixInstance.versionRange().contains(expectVersion)) {
return func(matrixInstance);
}
return true;