commit 8a5fabc19f06c39aba60365288cb6898cde46cb4
author Steven Moreland <smoreland@google.com> Mon Oct 29 18:10:33 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 29 18:10:33 2018 -0700
tree 422900cbcf4f0127d1e91cf915f12e8425d7a427
parent db1dbb6117bf9e1bf626f52ab03fc54f0f56e985
parent ccfa21394dcfc163322c56f2f12bbd25506703f7

Use FQName getVersion.
am: ccfa21394d

Change-Id: Ia81bdc77cfff53220025df4aa6f56e820a489c93

Vintf.cpp

diff --git a/Vintf.cpp b/Vintf.cpp
index 263f9a4..88c4157 100644
--- a/Vintf.cpp
+++ b/Vintf.cpp
@@ -16,9 +16,7 @@
     if (vm == nullptr) {
         return vintf::Transport::EMPTY;
     }
-    return vm->getTransport(fqName.package(),
-            vintf::Version{fqName.getPackageMajorVersion(), fqName.getPackageMinorVersion()},
-            fqName.name(), instanceName);
+    return vm->getTransport(fqName.package(), fqName.getVersion(), fqName.name(), instanceName);
 }
 
 vintf::Transport getTransport(const std::string &interfaceName, const std::string &instanceName) {
@@ -71,12 +69,10 @@
     auto deviceManifest = vintf::VintfObject::GetDeviceHalManifest();
     auto frameworkManifest = vintf::VintfObject::GetFrameworkHalManifest();
 
-    vintf::Version version = {fqName.getPackageMajorVersion(), fqName.getPackageMinorVersion()};
-
     std::set<std::string> deviceSet =
-        deviceManifest->getInstances(fqName.package(), version, fqName.name());
+        deviceManifest->getInstances(fqName.package(), fqName.getVersion(), fqName.name());
     std::set<std::string> frameworkSet =
-        frameworkManifest->getInstances(fqName.package(), version, fqName.name());
+        frameworkManifest->getInstances(fqName.package(), fqName.getVersion(), fqName.name());
 
     ret.insert(deviceSet.begin(), deviceSet.end());
     ret.insert(frameworkSet.begin(), frameworkSet.end());