commit 2b9bb170bb7fd29c662c2d6d23f7a22a1b534a41
author Steven Moreland <smoreland@google.com> Sat Feb 11 22:13:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Feb 11 22:13:50 2017 +0000
tree caf460cf701f601268fcdf3fb044ccd3ec27491e
parent 84d2494d19413cbe59c29171a6291f80f7491f45
parent f9c9f59bf70345bc13df54c4e1f27feb9bc70c64

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

Change-Id: Ifab588417d83cacdf1cf02225400be59f717de86

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