commit e682a5a8f0ea3d9221fac214232c8a6f18cfb035
author Yifan Hong <elsk@google.com> Mon Feb 13 18:14:39 2017 +0000
committer Yifan Hong <elsk@google.com> Mon Feb 13 18:14:39 2017 +0000
tree 602ed3cbeacfee23304b68c52fc3475540a6942e
parent f9c9f59bf70345bc13df54c4e1f27feb9bc70c64

Revert "Revert "Update for using integers for major/minor versions in FQName.""

This reverts commit f9c9f59bf70345bc13df54c4e1f27feb9bc70c64.

Change-Id: Ife0c840dd9e967771b3c500bd7f4ffc7725df816

base/HidlSupport.cpp

diff --git a/base/HidlSupport.cpp b/base/HidlSupport.cpp
index 912a5b0..01590c3 100644
--- a/base/HidlSupport.cpp
+++ b/base/HidlSupport.cpp
@@ -61,15 +61,13 @@
         LOG(WARNING) << "getTransportFromManifest: Cannot find vendor interface manifest.";
         return vintf::Transport::EMPTY;
     }
-    size_t majorVer;
-    size_t minorVer;
-    if (   !::android::base::ParseUint(fqName.getPackageMajorVersion(), &majorVer)
-        || !::android::base::ParseUint(fqName.getPackageMinorVersion(), &minorVer)) {
+    if (!fqName.hasVersion()) {
         LOG(ERROR) << "getTransportFromManifest: " << fqName.string()
                    << " does not specify a version.";
         return vintf::Transport::EMPTY;
     }
-    vintf::Transport tr = vm->getTransport(package, vintf::Version{majorVer, minorVer});
+    vintf::Transport tr = vm->getTransport(package,
+            vintf::Version{fqName.getPackageMajorVersion(), fqName.getPackageMinorVersion()});
     if (tr == vintf::Transport::EMPTY) {
         LOG(WARNING) << "getTransportFromManifest: Cannot find entry "
                      << package << fqName.atVersion() << " in vendor interface manifest.";