commit 8bb02bc9c6e605aeb2d61e4c8f8ac30d5bf8fb10
author Steven Moreland <smoreland@google.com> Sat Feb 11 22:20:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Feb 11 22:20:20 2017 +0000
tree caf460cf701f601268fcdf3fb044ccd3ec27491e
parent 0b4ed9c0a6a253972c1b63661f275dd6f11bd6f3
parent 82feac8978bfc82a7a9e7217f1d6c1801f684627

Revert "Update for using integers for major/minor versions in FQName." am: f9c9f59bf7 am: 2b9bb170bb am: a95036359e
am: 82feac8978

Change-Id: I6a9983094a305c04f711ab3783e8bdff5f191417

base/HidlSupport.cpp

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