diff options
author | Yifan Hong <elsk@google.com> | 2017-02-13 18:14:39 +0000 |
---|---|---|
committer | Yifan Hong <elsk@google.com> | 2017-02-13 18:14:39 +0000 |
commit | e682a5a8f0ea3d9221fac214232c8a6f18cfb035 (patch) | |
tree | 602ed3cbeacfee23304b68c52fc3475540a6942e /base/HidlSupport.cpp | |
parent | f9c9f59bf70345bc13df54c4e1f27feb9bc70c64 (diff) | |
download | libhidl-e682a5a8f0ea3d9221fac214232c8a6f18cfb035.tar.gz |
Revert "Revert "Update for using integers for major/minor versions in FQName.""
This reverts commit f9c9f59bf70345bc13df54c4e1f27feb9bc70c64.
Change-Id: Ife0c840dd9e967771b3c500bd7f4ffc7725df816
Diffstat (limited to 'base/HidlSupport.cpp')
-rw-r--r-- | base/HidlSupport.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
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 @@ vintf::Transport getTransportForHals(const FQName &fqName) { 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."; |