diff options
Diffstat (limited to 'cmds/lshal/Lshal.cpp')
| -rw-r--r-- | cmds/lshal/Lshal.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cmds/lshal/Lshal.cpp b/cmds/lshal/Lshal.cpp index bc99f4d473..132b31ebc3 100644 --- a/cmds/lshal/Lshal.cpp +++ b/cmds/lshal/Lshal.cpp @@ -59,8 +59,7 @@ void Lshal::forEachCommand(const std::function<void(const Command* c)>& f) const } void Lshal::usage() { - err() << "lshal: List and debug HIDL HALs." << std::endl - << " (for AIDL HALs, see `dumpsys`)" << std::endl << std::endl + err() << "lshal: List and debug HALs." << std::endl << std::endl << "commands:" << std::endl; size_t nameMaxLength = 0; @@ -102,7 +101,7 @@ Status Lshal::emitDebugInfo( const std::string &interfaceName, const std::string &instanceName, const std::vector<std::string> &options, - ParentDebugInfoLevel parentDebugInfoLevel, + bool excludesParentInstances, std::ostream &out, NullableOStream<std::ostream> err) const { using android::hidl::base::V1_0::IBase; @@ -127,7 +126,7 @@ Status Lshal::emitDebugInfo( return NO_INTERFACE; } - if (parentDebugInfoLevel != ParentDebugInfoLevel::FULL) { + if (excludesParentInstances) { const std::string descriptor = getDescriptor(base.get()); if (descriptor.empty()) { std::string msg = interfaceName + "/" + instanceName + " getDescriptor failed"; @@ -135,14 +134,11 @@ Status Lshal::emitDebugInfo( LOG(ERROR) << msg; } if (descriptor != interfaceName) { - if (parentDebugInfoLevel == ParentDebugInfoLevel::FQNAME_ONLY) { - out << "[See " << descriptor << "/" << instanceName << "]"; - } return OK; } } - PipeRelay relay(out, err, interfaceName, instanceName); + PipeRelay relay(out); if (relay.initCheck() != OK) { std::string msg = "PipeRelay::initCheck() FAILED w/ " + std::to_string(relay.initCheck()); |