diff options
| author | Steven Moreland <smoreland@google.com> | 2017-02-23 23:19:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-23 23:19:56 +0000 |
| commit | 359b7777143af5cc101cb18bfd39ffdab03d3845 (patch) | |
| tree | a38fddbd0fd9fbf1c4ff10de73d4f84398ece2c2 /base/HidlSupport.cpp | |
| parent | 6dbb4698cb8d19a917906fbc22706b53a623f402 (diff) | |
| parent | 395c142e0e6e5c9c18a86c55efdc185d09cb8b9f (diff) | |
| download | libhidl-359b7777143af5cc101cb18bfd39ffdab03d3845.tar.gz | |
Merge "Updating warning messages for getTransport." am: b7b89dbc02 am: 1d83fed7e3
am: 395c142e0e
Change-Id: I51bbd749530b1030f9fde0c11c07174c1fe7d071
Diffstat (limited to 'base/HidlSupport.cpp')
| -rw-r--r-- | base/HidlSupport.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/base/HidlSupport.cpp b/base/HidlSupport.cpp index 595e37a..0612050 100644 --- a/base/HidlSupport.cpp +++ b/base/HidlSupport.cpp @@ -37,8 +37,8 @@ vintf::Transport getTransportForFrameworkPackages(const std::string &name) { }; auto it = sTransports.find(name); if (it == sTransports.end()) { - LOG(WARNING) << "getTransportForFrameworkPackages: Cannot find entry " - << name << " in the static map."; + LOG(ERROR) << "getTransportForFrameworkPackages: Cannot find entry " + << name << " in the static map. Using default transport."; return vintf::Transport::EMPTY; } else { LOG(INFO) << "getTransportForFrameworkPackages: " << name @@ -51,21 +51,18 @@ vintf::Transport getTransportForHals(const FQName &fqName) { const std::string package = fqName.package(); const vintf::HalManifest *vm = vintf::HalManifest::Get(); if (vm == nullptr) { - LOG(WARNING) << "getTransportFromManifest: Cannot find vendor interface manifest."; - return vintf::Transport::EMPTY; - } - if (!fqName.hasVersion()) { - LOG(ERROR) << "getTransportFromManifest: " << fqName.string() - << " does not specify a version."; + LOG(WARNING) << "getTransportForHals: No VINTF defined, using default transport for " + << fqName.string() << "."; return vintf::Transport::EMPTY; } 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."; + LOG(WARNING) << "getTransportForHals: Cannot find entry " + << package << fqName.atVersion() + << " in vendor interface manifest. Using default transport."; } else { - LOG(INFO) << "getTransportFromManifest: " << package << fqName.atVersion() + LOG(INFO) << "getTransportForHals: " << package << fqName.atVersion() << " declares transport method " << to_string(tr); } return tr; @@ -74,7 +71,12 @@ vintf::Transport getTransportForHals(const FQName &fqName) { vintf::Transport getTransport(const std::string &name) { FQName fqName(name); if (!fqName.isValid()) { - LOG(WARNING) << name << " is not a valid fully-qualified name."; + LOG(ERROR) << "getTransport: " << name << " is not a valid fully-qualified name."; + return vintf::Transport::EMPTY; + } + if (!fqName.hasVersion()) { + LOG(ERROR) << "getTransport: " << fqName.string() + << " does not specify a version. Using default transport."; return vintf::Transport::EMPTY; } if (fqName.inPackage("android.hidl")) { |