commit 072f12dd33706958412694714cfc17da85ea86b0
author Yifan Hong <elsk@google.com> Wed Aug 08 13:04:51 2018 -0700
committer Yifan Hong <elsk@google.com> Wed Aug 08 14:38:49 2018 -0700
tree 969b668343135644a27bffbefb3aedc054c993d8
parent 304cdab7107142bd5047715871b60024d6c1ed1b

DisabledChecks -> CheckFlags namespace

Switch from negative flags to positive flags using
the dedicated CheckFlags::Type class.

Bug: 110711640
Test: libvintf_test
Test: vintf_object_test
Change-Id: I13f741b64520bd58349dbbf6c874dd1559d79ad8

RuntimeInfo.cpp

diff --git a/RuntimeInfo.cpp b/RuntimeInfo.cpp
index 63a8c18..5727a21 100644
--- a/RuntimeInfo.cpp
+++ b/RuntimeInfo.cpp
@@ -102,7 +102,7 @@
 }
 
 bool RuntimeInfo::checkCompatibility(const CompatibilityMatrix& mat, std::string* error,
-                                     DisabledChecks disabledChecks) const {
+                                     CheckFlags::Type flags) const {
     if (mat.mType != SchemaType::FRAMEWORK) {
         if (error != nullptr) {
             *error = "Should not check runtime info against " + to_string(mat.mType)
@@ -161,7 +161,7 @@
         error->clear();
     }
 
-    if ((disabledChecks & DISABLE_AVB_CHECK) == 0) {
+    if (flags.isAvbEnabled()) {
         const Version& matAvb = mat.framework.mAvbMetaVersion;
         if (mBootAvbVersion.majorVer != matAvb.majorVer ||
             mBootAvbVersion.minorVer < matAvb.minorVer) {