From a46e2f840b5574b0c6cf633fadebc9f66f76194b Mon Sep 17 00:00:00 2001
From: Yifan Hong <elsk@google.com>
Date: Thu, 13 Apr 2017 01:00:12 -0700
Subject: Update to allow multiple HALs in a manifest.

Test: libvintf_test
Test: lshal --init_vintf

Bug: 37294247
Change-Id: I202787d7856db6e06e595bd52c644f6a0eefcb66
---
 cmds/lshal/Lshal.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmds/lshal/Lshal.cpp b/cmds/lshal/Lshal.cpp
index 420ec3cbf6..d3ceab9ae9 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,
@@ -307,7 +307,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
-- 
cgit v1.2.3-59-g8ed1b