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

Commit 3d76135f authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge changes from topic "lshal_improve" 

am: 0639471d

Change-Id: I9a59f890b5c4c0469c49f0a4ef36c38e4256c5a4
parents 5b2b7e91 0639471d

cmds/lshal/ListCommand.cpp

+1 −1
Original line number Diff line number Diff line
@@ -799,7 +799,7 @@ void ListCommand::registerAllOptions() { 
    mOptions.push_back({'l', "released", no_argument, v++, [](ListCommand* thiz, const char*) {

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

        return OK;

    }, "print the 'is released?' column\n(Y=released, empty=unreleased or unknown)"});

    }, "print the 'is released?' column\n(Y=released, N=unreleased, ?=unknown)"});

    mOptions.push_back({'t', "transport", no_argument, v++, [](ListCommand* thiz, const char*) {

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

        return OK;

cmds/lshal/TableEntry.cpp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static const std::string &getArchString(vintf::Arch arch) { 
    static const std::string sStr64 = "64";

    static const std::string sStr32 = "32";

    static const std::string sStrBoth = "32+64";

    static const std::string sStrUnknown = "";

    static const std::string sStrUnknown = "?";

    switch (arch) {

        case vintf::Arch::ARCH_64:

            return sStr64;