KernelInfo::getMatchedKernelRequirements takes kernel FCM version
Add kernel FCM version as an arg to getMatchedKernelRequirements.
The legacy behavior (devices with kernel FCM version UNSPECIFIED) is
preserved.
New behavior (devices with kernel FCM version set) is
implemented, but matrices don't have the correct <kernel> tags for
these devices yet. This is fixed and tested in the next CL.
Test: libvintf_test
Test: vintf_object_test
Bug: 139309488
Change-Id: I6f0d8cbb1424116d6d07fafa6573b29d6fb720fe
diff --git a/CompatibilityMatrix.cpp b/CompatibilityMatrix.cpp
index a383e36..c6fa25e 100644
--- a/CompatibilityMatrix.cpp
+++ b/CompatibilityMatrix.cpp
@@ -48,8 +48,7 @@
if (it->minLts() == kernel.minLts()) {
break;
}
- if (it->minLts().version == kernel.minLts().version &&
- it->minLts().majorRev == kernel.minLts().majorRev) {
+ if (it->minLts().dropMinor() == kernel.minLts().dropMinor()) {
if (error) {
*error = "Kernel version mismatch; cannot add " + to_string(kernel.minLts()) +
" because " + to_string(it->minLts()) + " was added.";