CompatibilityMatrix::matchInstance: take format as well.
It didn't take into account of format(). Include that as well.
Note that this is a private function and is only used by
HalManifest. Hence, there is no need to create a public
matchHidlInstance.
Test: libvintf_test
Test: vintf_object_test
Bug: 140832836
Change-Id: I7006595823104b22cf0c122a13535eae03000563
diff --git a/CompatibilityMatrix.cpp b/CompatibilityMatrix.cpp
index 1e519e0..2f215d9 100644
--- a/CompatibilityMatrix.cpp
+++ b/CompatibilityMatrix.cpp
@@ -463,11 +463,11 @@
return true;
}
-bool CompatibilityMatrix::matchInstance(const std::string& halName, const Version& version,
- const std::string& interfaceName,
+bool CompatibilityMatrix::matchInstance(HalFormat format, const std::string& halName,
+ const Version& version, const std::string& interfaceName,
const std::string& instance) const {
bool found = false;
- (void)forEachInstanceOfInterface(halName, version, interfaceName,
+ (void)forEachInstanceOfInterface(format, halName, version, interfaceName,
[&found, &instance](const auto& e) {
found |= (e.matchInstance(instance));
return !found; // if not found, continue