diff options
author | Steven Moreland <smoreland@google.com> | 2017-02-23 13:19:32 -0800 |
---|---|---|
committer | Steven Moreland <smoreland@google.com> | 2017-02-23 21:35:45 +0000 |
commit | 6d8960dd6da751d0c445a1cb1b680d3a3500593d (patch) | |
tree | 56c1b14e37c3b82b3e12f0c6b3bcd98666f9fe46 | |
parent | 8dd657432832bc5117e644c85e8e2b1ec244d2a0 (diff) | |
download | libhidl-6d8960dd6da751d0c445a1cb1b680d3a3500593d.tar.gz |
Updating warning messages for getTransport.
- Make unsevere warnings seem less severe. Adding "using default" now so
that people stop considering these errors and searching in the wrong
places when debugging.
- Print fqName when getTransport is called but no VINTF is on the
device. This is useful for debugging why processes are querying
transport on devices which don't have a VINTF defined.
Fixes: 35695258
Test: hidl_test
Change-Id: I95396b542c367832cbcfb7cad044354ec363caae
-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 20b9f26..ec5b18f 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")) { |