commit 12b6a2b005ea33b463adedc994a74013c30420ce
author Yifan Hong <elsk@google.com> Mon Sep 16 18:03:53 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 16 18:03:53 2019 -0700
tree ca554699d15753abbc673dbf76d9434e9128af6e
parent 1a2ec9be34aef78ce213bedafe5d392c257a4fa4
parent 79595c360e966c0e9dbf9ca37f95c62d7fe40a41

Rename to HalManifest.getHidlInstances am: 3fbad90e25 am: d49f3d3eee am: 8b2ba2d528
am: 79595c360e

Change-Id: Ibfa6954426ffc7f5efd56d629286686a49e48638

Vintf.cpp

diff --git a/Vintf.cpp b/Vintf.cpp
index ae4ba45..fca4775 100644
--- a/Vintf.cpp
+++ b/Vintf.cpp
@@ -32,7 +32,8 @@
     if (vm == nullptr) {
         return vintf::Transport::EMPTY;
     }
-    return vm->getTransport(fqName.package(), fqName.getVersion(), fqName.name(), instanceName);
+    return vm->getHidlTransport(fqName.package(), fqName.getVersion(),
+                                fqName.name(), instanceName);
 }
 
 vintf::Transport getTransport(const std::string &interfaceName, const std::string &instanceName) {
@@ -84,10 +85,10 @@
     auto deviceManifest = vintf::VintfObject::GetDeviceHalManifest();
     auto frameworkManifest = vintf::VintfObject::GetFrameworkHalManifest();
 
-    std::set<std::string> deviceSet =
-        deviceManifest->getInstances(fqName.package(), fqName.getVersion(), fqName.name());
-    std::set<std::string> frameworkSet =
-        frameworkManifest->getInstances(fqName.package(), fqName.getVersion(), fqName.name());
+    std::set<std::string> deviceSet = deviceManifest->getHidlInstances(
+        fqName.package(), fqName.getVersion(), fqName.name());
+    std::set<std::string> frameworkSet = frameworkManifest->getHidlInstances(
+        fqName.package(), fqName.getVersion(), fqName.name());
 
     ret.insert(deviceSet.begin(), deviceSet.end());
     ret.insert(frameworkSet.begin(), frameworkSet.end());