commit b9428d6a1e8363c693c96478f1d4b51a0a2f1f60
author Yifan Hong <elsk@google.com> Mon Feb 13 22:07:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 13 22:07:33 2017 +0000
tree 7f3cfe24161e86e823f1f6bab9c1d4d0c1bae044
parent f2b7f7d7e75c13d34ae352a2b006c391ce706ac5
parent 88eb96328a22093e4a45ecc9db470a3193fe43f0

Merge "Revert "Revert "Update for using integers for major/minor versions in FQName.""" am: 2d33a28045 am: 1eb11f19a1 am: f26170880f
am: 88eb96328a

Change-Id: I430aaea6861cb74388eb48ac5bc673ef1a5998fd

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.";