summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYifan Hong2017-04-14 19:30:53 -0500
committerYifan Hong2017-04-15 02:53:09 -0500
commit19e0a2a660d69377a32e52084858e5162a34f154 (patch)
tree1cf123b8119286fa78443af86810483646e328b0 /parse_xml.cpp
parent65cc7224494d2d470d8b2ff82cdd87f2e2df4666 (diff)
downloadplatform-system-libvintf-19e0a2a660d69377a32e52084858e5162a34f154.tar.gz
platform-system-libvintf-19e0a2a660d69377a32e52084858e5162a34f154.tar.xz
platform-system-libvintf-19e0a2a660d69377a32e52084858e5162a34f154.zip
Allow avb.vbmeta-version to be missing from compat mat
For non verified boot devices, vbmeta-version doesn't make sense. So allow it to be missing from compatibility matrix. Test: libvintf_test Bug: 35322304 Change-Id: I6583c65c28441dec5f7f5f4520fd18a2a22f89e0
Diffstat (limited to 'parse_xml.cpp')
-rw-r--r--parse_xml.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/parse_xml.cpp b/parse_xml.cpp
index 28806ba..81e9b42 100644
--- a/parse_xml.cpp
+++ b/parse_xml.cpp
@@ -685,7 +685,7 @@ struct CompatibilityMatrixConverter : public XmlNodeConverter<CompatibilityMatri
685 if (object->mType == SchemaType::FRAMEWORK) { 685 if (object->mType == SchemaType::FRAMEWORK) {
686 if (!parseChildren(root, matrixKernelConverter, &object->framework.mKernels) || 686 if (!parseChildren(root, matrixKernelConverter, &object->framework.mKernels) ||
687 !parseChild(root, sepolicyConverter, &object->framework.mSepolicy) || 687 !parseChild(root, sepolicyConverter, &object->framework.mSepolicy) ||
688 !parseChild(root, avbConverter, &object->framework.mAvbMetaVersion)) { 688 !parseOptionalChild(root, avbConverter, {}, &object->framework.mAvbMetaVersion)) {
689 return false; 689 return false;
690 } 690 }
691 } else if (object->mType == SchemaType::DEVICE) { 691 } else if (object->mType == SchemaType::DEVICE) {