Update ManifestInstance::description for AIDL HALs.
Now that AIDL HALs may have a version, also
emit the version at the end of messages.
Test: libvintf_test
Test: vintf_object_test
Bug: 150034914
Change-Id: I2cdbfce873d7c4d1bc3493f6a006aa5308e42466
diff --git a/ManifestInstance.cpp b/ManifestInstance.cpp
index 9e0f919..543c617 100644
--- a/ManifestInstance.cpp
+++ b/ManifestInstance.cpp
@@ -113,7 +113,8 @@
std::string ManifestInstance::description() const {
switch (format()) {
case HalFormat::AIDL: {
- return toAidlFqnameString(package(), interface(), instance());
+ return toAidlFqnameString(package(), interface(), instance()) + " (@" +
+ aidlVersionToString(version()) + ")";
} break;
case HalFormat::HIDL:
[[fallthrough]];
diff --git a/include/vintf/ManifestInstance.h b/include/vintf/ManifestInstance.h
index f8c44f1..cd9b51d 100644
--- a/include/vintf/ManifestInstance.h
+++ b/include/vintf/ManifestInstance.h
@@ -56,8 +56,8 @@
// return [@version::]interface/instance printing and writing XML.
std::string getSimpleFqInstance() const;
- // For AIDL, return package.interface/instance.
- // For others, return package@version::interface/instance.
+ // For AIDL, return "package.interface/instance (@version)".
+ // For others, return "package@version::interface/instance".
std::string description() const;
// Return a new ManifestInstance that's the same as this, but with the given version.
