diff options
| author | 2017-04-17 18:12:27 +0000 | |
|---|---|---|
| committer | 2017-04-17 18:12:29 +0000 | |
| commit | dd315948dbfa02ca4262ca5bb0e29e25b95803ad (patch) | |
| tree | 4f39ebf0878d622deb3632fc3eb1ea217b0a9c22 | |
| parent | c1c9354ad8d5ac797ff2b1bbabfeef35c674dd2a (diff) | |
| parent | a46e2f840b5574b0c6cf633fadebc9f66f76194b (diff) | |
Merge "Update to allow multiple HALs in a manifest."
| -rw-r--r-- | cmds/lshal/Lshal.cpp | 4 |
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 |