commit f302930a51397aa422355644b5de31439056eb51
author Yifan Hong <elsk@google.com> Wed Apr 12 17:23:49 2017 -0700
committer Yifan Hong <elsk@google.com> Thu Apr 13 18:02:41 2017 -0700
tree 6397efe5735e6d6ef5c86897d667c296dbc32777
parent fa2b18bda6b3f8611dc93ebb32209943578a6539

Add avb.vbmeta-version to CompatibilityMatrix and RuntimeInfo

RuntimeInfo fetch avb vbmeta version by reading the following two sysprops:
- ro.boot.vbmeta.avb_version
- ro.boot.avb_version
If the sysprop does not exist, 0.0 is set.

Test: libvintf_test
Test: adb shell vintf (shows 0.0 because CLs
for sysprops are not merged yet)

Bug: 35322304
Change-Id: I345bc792d1a7ceb585d246ec657707814b42ceff

test/main.cpp

diff --git a/test/main.cpp b/test/main.cpp
index 600f760..e82cab1 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -61,6 +61,13 @@
         cm.device.mVndk.mVersionRange = range;
         cm.device.mVndk.mLibraries = libs;
     }
+    void setAvb(RuntimeInfo &ki, Version initVersion, Version bootVersion) {
+        ki.mAvbInitVersion = initVersion;
+        ki.mAvbBootVersion = bootVersion;
+    }
+    void setAvb(CompatibilityMatrix &cm, Version &&avbVersion) {
+        cm.framework.mAvbMetaVersion = avbVersion;
+    }
     const ManifestHal *getHal(HalManifest &vm, const std::string &name) {
         return vm.getHal(name);
     }
@@ -134,6 +141,7 @@
             {"CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES", "\"\""},
             {"CONFIG_ILLEGAL_POINTER_VALUE", "0xdead000000000000"}
         };
+        info.mAvbBootVersion = info.mAvbInitVersion = {2, 1};
         return info;
     }
 };
@@ -388,6 +396,7 @@
     EXPECT_TRUE(add(cm, MatrixKernel{KernelVersion(4, 4, 1),
             {KernelConfig{"CONFIG_BAZ", 20}, KernelConfig{"CONFIG_BAR", KernelConfigRangeValue{3, 5} }}}));
     set(cm, Sepolicy(30, {{25, 0}, {26, 0, 3}}));
+    setAvb(cm, Version{2, 1});
     std::string xml = gCompatibilityMatrixConverter(cm);
     EXPECT_EQ(xml,
             "<compatibility-matrix version=\"1.0\" type=\"framework\">\n"
@@ -426,6 +435,9 @@
             "        <sepolicy-version>25.0</sepolicy-version>\n"
             "        <sepolicy-version>26.0-3</sepolicy-version>\n"
             "    </sepolicy>\n"
+            "    <avb>\n"
+            "        <vbmeta-version>2.1</vbmeta-version>\n"
+            "    </avb>\n"
             "</compatibility-matrix>\n");
     CompatibilityMatrix cm2;
     EXPECT_TRUE(gCompatibilityMatrixConverter(&cm2, xml));
@@ -514,6 +526,7 @@
         CompatibilityMatrix cm;
         add(cm, std::move(kernel));
         set(cm, {30, {{25, 0}}});
+        setAvb(cm, {2, 1});
         return cm;
     };
 
@@ -581,6 +594,25 @@
         CompatibilityMatrix cm = testMatrix(std::move(kernel));
         EXPECT_FALSE(ki.checkCompatibility(cm)) << "Value shouldn't match for integer";
     }
+
+    RuntimeInfo badAvb = testRuntimeInfo();
+    CompatibilityMatrix cm = testMatrix(MatrixKernel(KernelVersion{3, 18, 31}, {}));
+    {
+        setAvb(badAvb, {1, 0}, {2, 1});
+        EXPECT_FALSE(badAvb.checkCompatibility(cm, &error));
+    }
+    {
+        setAvb(badAvb, {2, 1}, {3, 0});
+        EXPECT_FALSE(badAvb.checkCompatibility(cm, &error));
+    }
+    {
+        setAvb(badAvb, {2, 1}, {2, 3});
+        EXPECT_TRUE(badAvb.checkCompatibility(cm, &error));
+    }
+    {
+        setAvb(badAvb, {2, 3}, {2, 1});
+        EXPECT_TRUE(badAvb.checkCompatibility(cm, &error));
+    }
 }
 
 } // namespace vintf