diff options
author | Steven Moreland <smoreland@google.com> | 2017-02-11 18:15:30 +0000 |
---|---|---|
committer | Steven Moreland <smoreland@google.com> | 2017-02-11 18:15:30 +0000 |
commit | f9c9f59bf70345bc13df54c4e1f27feb9bc70c64 (patch) | |
tree | caf460cf701f601268fcdf3fb044ccd3ec27491e /base/HidlSupport.cpp | |
parent | abde972c1df678519233d7deeb6f5e8d138c022d (diff) | |
download | libhidl-f9c9f59bf70345bc13df54c4e1f27feb9bc70c64.tar.gz |
Revert "Update for using integers for major/minor versions in FQName."
This reverts commit abde972c1df678519233d7deeb6f5e8d138c022d.
Change-Id: I045fe427b2517e85a38d402f2dd8682609d691ca
Diffstat (limited to 'base/HidlSupport.cpp')
-rw-r--r-- | base/HidlSupport.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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 @@ vintf::Transport getTransportForHals(const FQName &fqName) { 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."; |