commit 76137726800081fa82a969a4d04d0e9bdea836b8
author Yifan Hong <elsk@google.com> Tue Jan 17 23:18:29 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 17 23:18:29 2023 +0000
tree b3e9ede5d770195bc405f767426422124ce297f0
parent 1549faf01e3ef1a34f2e8cf0f00b5123251fda34
parent cb5a1abe2d29f426edc59b09c37487bee91e2d85

Merge "lshal: Use vintf::FqInstance for VINTF APIs."

cmds/lshal/ListCommand.cpp

diff --git a/cmds/lshal/ListCommand.cpp b/cmds/lshal/ListCommand.cpp
index ff73c94..e54f9d3 100644
--- a/cmds/lshal/ListCommand.cpp
+++ b/cmds/lshal/ListCommand.cpp
@@ -353,8 +353,16 @@
         return false;
     }
 
+    auto vintfFqInstance = vintf::FqInstance::from(fqInstance.string());
+    if (!vintfFqInstance.has_value()) {
+        err() << "Unable to convert " << fqInstance.string() << " to vintf::FqInstance"
+              << std::endl;
+        return false;
+    }
+
     std::string e;
-    if (!manifest->insertInstance(fqInstance, entry.transport, arch, vintf::HalFormat::HIDL, &e)) {
+    if (!manifest->insertInstance(*vintfFqInstance, entry.transport, arch, vintf::HalFormat::HIDL,
+                                  &e)) {
         err() << "Warning: Cannot insert '" << fqInstance.string() << ": " << e << std::endl;
         return false;
     }