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

VintfObject.cpp

diff --git a/VintfObject.cpp b/VintfObject.cpp
index 7f45010..1086590 100644
--- a/VintfObject.cpp
+++ b/VintfObject.cpp
@@ -506,7 +506,7 @@
 // compatability info is given then the device info will be checked against
 // itself.
 int32_t VintfObject::checkCompatibility(const std::vector<std::string>& xmls, bool mount,
-                                        std::string* error, DisabledChecks disabledChecks) {
+                                        std::string* error, CheckFlags::Type flags) {
     status_t status;
     ParseStatus parseStatus;
     PackageInfo pkg; // All information from package.
@@ -576,7 +576,7 @@
         }
     }
 
-    if ((disabledChecks & DISABLE_RUNTIME_INFO) == 0) {
+    if (flags.isRuntimeInfoEnabled()) {
         updated.runtimeInfo = getRuntimeInfo(true /* skipCache */);
     }
 
@@ -598,7 +598,7 @@
         status = NO_INIT;
     }
 
-    if ((disabledChecks & DISABLE_RUNTIME_INFO) == 0) {
+    if (flags.isRuntimeInfoEnabled()) {
         if (updated.runtimeInfo == nullptr) {
             appendLine(error, "No runtime info from device");
             status = NO_INIT;
@@ -622,8 +622,8 @@
         return INCOMPATIBLE;
     }
 
-    if ((disabledChecks & DISABLE_RUNTIME_INFO) == 0) {
-        if (!updated.runtimeInfo->checkCompatibility(*updated.fwk.matrix, error, disabledChecks)) {
+    if (flags.isRuntimeInfoEnabled()) {
+        if (!updated.runtimeInfo->checkCompatibility(*updated.fwk.matrix, error, flags)) {
             if (error) {
                 error->insert(0,
                               "Runtime info and framework compatibility matrix are incompatible: ");
@@ -668,13 +668,13 @@
 }  // namespace details
 
 int32_t VintfObject::CheckCompatibility(const std::vector<std::string>& xmls, std::string* error,
-                                        DisabledChecks disabledChecks) {
-    return GetInstance()->checkCompatibility(xmls, error, disabledChecks);
+                                        CheckFlags::Type flags) {
+    return GetInstance()->checkCompatibility(xmls, error, flags);
 }
 
 int32_t VintfObject::checkCompatibility(const std::vector<std::string>& xmls, std::string* error,
-                                        DisabledChecks disabledChecks) {
-    return checkCompatibility(xmls, false /* mount */, error, disabledChecks);
+                                        CheckFlags::Type flags) {
+    return checkCompatibility(xmls, false /* mount */, error, flags);
 }
 
 bool VintfObject::IsHalDeprecated(const MatrixHal& oldMatrixHal,