Merge "<kernel> compat check can be split"

am: 34168f34e0

Change-Id: Ib1e2bc26efc6de3393a8dc0bfff6bec68119bd6a

2 files changed, 35 insertions, 31 deletions

diff --git a/RuntimeInfo.cpp b/RuntimeInfo.cpp
index 5727a21..2338cd2 100644
--- a/RuntimeInfo.cpp
+++ b/RuntimeInfo.cpp
@@ -122,43 +122,45 @@ bool RuntimeInfo::checkCompatibility(const CompatibilityMatrix& mat, std::string
     // mat.mSepolicy.sepolicyVersion() is checked against static
     // HalManifest.device.mSepolicyVersion in HalManifest::checkCompatibility.
 
-    bool foundMatchedKernelVersion = false;
-    bool foundMatchedConditions = false;
-    for (const MatrixKernel& matrixKernel : mat.framework.mKernels) {
-        if (!matchKernelVersion(matrixKernel.minLts())) {
-            continue;
-        }
-        foundMatchedKernelVersion = true;
-        // ignore this fragment if not all conditions are met.
-        if (!matchKernelConfigs(matrixKernel.conditions(), error)) {
-            continue;
+    if (flags.isKernelEnabled()) {
+        bool foundMatchedKernelVersion = false;
+        bool foundMatchedConditions = false;
+        for (const MatrixKernel& matrixKernel : mat.framework.mKernels) {
+            if (!matchKernelVersion(matrixKernel.minLts())) {
+                continue;
+            }
+            foundMatchedKernelVersion = true;
+            // ignore this fragment if not all conditions are met.
+            if (!matchKernelConfigs(matrixKernel.conditions(), error)) {
+                continue;
+            }
+            foundMatchedConditions = true;
+            if (!matchKernelConfigs(matrixKernel.configs(), error)) {
+                return false;
+            }
         }
-        foundMatchedConditions = true;
-        if (!matchKernelConfigs(matrixKernel.configs(), error)) {
+        if (!foundMatchedKernelVersion) {
+            if (error != nullptr) {
+                std::stringstream ss;
+                ss << "Framework is incompatible with kernel version " << mKernelVersion
+                   << ", compatible kernel versions are";
+                for (const MatrixKernel& matrixKernel : mat.framework.mKernels)
+                    ss << " " << matrixKernel.minLts();
+                *error = ss.str();
+            }
             return false;
         }
-    }
-    if (!foundMatchedKernelVersion) {
-        if (error != nullptr) {
-            std::stringstream ss;
-            ss << "Framework is incompatible with kernel version " << mKernelVersion
-               << ", compatible kernel versions are";
-            for (const MatrixKernel& matrixKernel : mat.framework.mKernels)
-                ss << " " << matrixKernel.minLts();
-            *error = ss.str();
+        if (!foundMatchedConditions) {
+            // This should not happen because first <conditions> for each <kernel> must be
+            // empty. Reject here for inconsistency.
+            if (error != nullptr) {
+                error->insert(0, "Framework match kernel version with unmet conditions:");
+            }
+            return false;
         }
-        return false;
-    }
-    if (!foundMatchedConditions) {
-        // This should not happen because first <conditions> for each <kernel> must be
-        // empty. Reject here for inconsistency.
         if (error != nullptr) {
-            error->insert(0, "Framework match kernel version with unmet conditions:");
+            error->clear();
         }
-        return false;
-    }
-    if (error != nullptr) {
-        error->clear();
     }
 
     if (flags.isAvbEnabled()) {
diff --git a/include/vintf/CheckFlags.h b/include/vintf/CheckFlags.h
index df247d9..d63a809 100644
--- a/include/vintf/CheckFlags.h
+++ b/include/vintf/CheckFlags.h
@@ -32,6 +32,7 @@ class Type {
 
     VINTF_CHECK_FLAGS_FIELD(Avb, 0)
     VINTF_CHECK_FLAGS_FIELD(RuntimeInfo, 1)
+    VINTF_CHECK_FLAGS_FIELD(Kernel, 2)
 #undef VINTF_CHECK_FLAGS_FIELD
 
     explicit constexpr Type(int32_t value) : mValue(value) {}
@@ -41,6 +42,7 @@ class Type {
 };
 
 constexpr Type ENABLE_ALL_CHECKS{~0};
+constexpr Type DISABLE_ALL_CHECKS{0};
 // Disable AVB version check in RuntimeInfo::checkCompatibility
 constexpr Type DISABLE_AVB_CHECK = ENABLE_ALL_CHECKS.disableAvb();
 // Disable RuntimeInfo <-> Framework Matrix check. This implies DISABLE_AVB_CHECK.