summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yifan Hong <elsk@google.com> 2017-04-13 01:00:12 -0700
committer Yifan Hong <elsk@google.com> 2017-04-13 01:00:12 -0700
commit5f5fde019855511c7dffbc8312d4d68c512a1d65 (patch)
tree75bdcd84f6c05d47afb48a29ec6814dd43fc8198
parent4a5c8a3c973d19a93444dba42c6b7056258446cb (diff)
Update to allow multiple HALs in a manifest.
Test: libvintf_test Test: lshal --init_vintf Bug: 37294247 Change-Id: I202787d7856db6e06e595bd52c644f6a0eefcb66
-rw-r--r--cmds/lshal/Lshal.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/lshal/Lshal.cpp b/cmds/lshal/Lshal.cpp
index 4c57361c92..33bc43c397 100644
--- a/cmds/lshal/Lshal.cpp
+++ b/cmds/lshal/Lshal.cpp
@@ -296,7 +296,7 @@ void Lshal::dumpVintf() const {
continue;
}
- vintf::ManifestHal *hal = manifest.getHal(fqName.package());
+ vintf::ManifestHal *hal = manifest.getAnyHal(fqName.package());
if (hal == nullptr) {
if (!manifest.add(vintf::ManifestHal{
.format = vintf::HalFormat::HIDL,
@@ -306,7 +306,7 @@ void Lshal::dumpVintf() const {
mErr << "Warning: cannot add hal '" << fqInstanceName << "'" << std::endl;
continue;
}
- hal = manifest.getHal(fqName.package());
+ hal = manifest.getAnyHal(fqName.package());
}
if (hal == nullptr) {
mErr << "Warning: cannot get hal '" << fqInstanceName