Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cf88e6a authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "lshal: emphasize HIDL in docs/output" am: 3d1ce705 am: a0849001 am: cab465b8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1570987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf2de568766d03bd32e087fde110b2fc74ba9117
parents 09dfe2a6 cab465b8

cmds/lshal/DebugCommand.cpp

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ std::string DebugCommand::getName() const { 
}



std::string DebugCommand::getSimpleDescription() const {

    return "Debug a specified HAL.";

    return "Debug a specified HIDL HAL.";

}



Status DebugCommand::parseArgs(const Arg &arg) {
@@ -78,7 +78,7 @@ void DebugCommand::usage() const { 
            "debug:\n"

            "    lshal debug [-E] <interface> [options [options [...]]] \n"

            "        Print debug information of a specified interface.\n"

            "        -E: excludes debug output if HAL is actually a subclass.\n"

            "        -E: excludes debug output if HIDL HAL is actually a subclass.\n"

            "        <interface>: Format is `android.hardware.foo@1.0::IFoo/default`.\n"

            "            If instance name is missing `default` is used.\n"

            "        options: space separated options to IBase::debug.\n";

cmds/lshal/ListCommand.cpp

+11 −11
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ std::string ListCommand::GetName() { 
    return "list";

}

std::string ListCommand::getSimpleDescription() const {

    return "List HALs.";

    return "List HIDL HALs.";

}



std::string ListCommand::parseCmdline(pid_t pid) const {
@@ -295,21 +295,21 @@ void ListCommand::postprocess() { 
    }



    mServicesTable.setDescription(

            "| All binderized services (registered with hwservicemanager)");

            "| All HIDL binderized services (registered with hwservicemanager)");

    mPassthroughRefTable.setDescription(

            "| All interfaces that getService() has ever returned as a passthrough interface;\n"

            "| All HIDL interfaces getService() has ever returned as a passthrough interface;\n"

            "| PIDs / processes shown below might be inaccurate because the process\n"

            "| might have relinquished the interface or might have died.\n"

            "| The Server / Server CMD column can be ignored.\n"

            "| The Clients / Clients CMD column shows all process that have ever dlopen'ed \n"

            "| the library and successfully fetched the passthrough implementation.");

    mImplementationsTable.setDescription(

            "| All available passthrough implementations (all -impl.so files).\n"

            "| All available HIDL passthrough implementations (all -impl.so files).\n"

            "| These may return subclasses through their respective HIDL_FETCH_I* functions.");

    mManifestHalsTable.setDescription(

            "| All HALs that are in VINTF manifest.");

            "| All HIDL HALs that are in VINTF manifest.");

    mLazyHalsTable.setDescription(

            "| All HALs that are declared in VINTF manifest:\n"

            "| All HIDL HALs that are declared in VINTF manifest:\n"

            "|    - as hwbinder HALs but are not registered to hwservicemanager, and\n"

            "|    - as hwbinder/passthrough HALs with no implementation.");

}
@@ -903,11 +903,11 @@ void ListCommand::registerAllOptions() { 
        thiz->mSelectedColumns.push_back(TableColumnType::VINTF);

        return OK;

    }, "print VINTF info. This column contains a comma-separated list of:\n"

       "    - DM: if the HAL is in the device manifest\n"

       "    - DC: if the HAL is in the device compatibility matrix\n"

       "    - FM: if the HAL is in the framework manifest\n"

       "    - FC: if the HAL is in the framework compatibility matrix\n"

       "    - X: if the HAL is in none of the above lists"});

       "    - DM: if the HIDL HAL is in the device manifest\n"

       "    - DC: if the HIDL HAL is in the device compatibility matrix\n"

       "    - FM: if the HIDL HAL is in the framework manifest\n"

       "    - FC: if the HIDL HAL is in the framework compatibility matrix\n"

       "    - X: if the HIDL HAL is in none of the above lists"});

    mOptions.push_back({'S', "service-status", no_argument, v++, [](ListCommand* thiz, const char*) {

        thiz->mSelectedColumns.push_back(TableColumnType::SERVICE_STATUS);

        return OK;

cmds/lshal/Lshal.cpp

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ void Lshal::forEachCommand(const std::function<void(const Command* c)>& f) const 
}



void Lshal::usage() {

    err() << "lshal: List and debug HALs." << std::endl << std::endl

    err() << "lshal: List and debug HIDL HALs." << std::endl

          << "   (for AIDL HALs, see `dumpsys`)" << std::endl << std::endl

          << "commands:" << std::endl;



    size_t nameMaxLength = 0;

cmds/lshal/WaitCommand.cpp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ std::string WaitCommand::getName() const { 
}



std::string WaitCommand::getSimpleDescription() const {

    return "Wait for HAL to start if it is not already started.";

    return "Wait for HIDL HAL to start if it is not already started.";

}



Status WaitCommand::parseArgs(const Arg &arg) {