Merge "Clarify comment how manifests are combined." am: ee45b5350a
am: cfcbb81e6a
Change-Id: I08c2aaefd577069d3cee394ec309c35dd7b9c611
diff --git a/VintfObject.cpp b/VintfObject.cpp
index aed9745..47480a4 100644
--- a/VintfObject.cpp
+++ b/VintfObject.cpp
@@ -232,7 +232,8 @@
// 3. ODM manifest (optional) + odm fragments
// 4. /vendor/manifest.xml (legacy, no fragments)
// where:
-// A + B means adding <hal> tags from B to A (so that <hal>s from B can override A)
+// A + B means unioning <hal> tags from A and B. If B declares an override, then this takes priority
+// over A.
status_t VintfObject::fetchDeviceHalManifest(HalManifest* out, std::string* error) {
status_t vendorStatus = fetchOneHalManifest(kVendorManifest, out, error);
if (vendorStatus != OK && vendorStatus != NAME_NOT_FOUND) {
