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

Commit 656dca79 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "dumpstate: avoid ':' in lshal files" into main am: d97e8bc3 am: 51dc4b13 

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



Change-Id: I66bd268bb579949b1481591995d05016d7c9439c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fdca4fce 51dc4b13

cmds/dumpstate/dumpstate.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -1416,12 +1416,12 @@ static void DumpHals(int out_fd = STDOUT_FILENO) { 
    auto ret = sm->list([&](const auto& interfaces) {

    auto ret = sm->list([&](const auto& interfaces) {

        for (const std::string& interface : interfaces) {

        for (const std::string& interface : interfaces) {

            std::string cleanName = interface;

            std::string cleanName = interface;

            std::replace_if(cleanName.begin(),

            std::replace_if(

                            cleanName.end(),

                cleanName.begin(), cleanName.end(),

                [](char c) {

                [](char c) {

                                return !isalnum(c) &&

                    return !isalnum(c) && std::string("@-_.").find(c) == std::string::npos;

                                    std::string("@-_:.").find(c) == std::string::npos;

                },

                            }, '_');

                '_');

            const std::string path = ds.bugreport_internal_dir_ + "/lshal_debug_" + cleanName;

            const std::string path = ds.bugreport_internal_dir_ + "/lshal_debug_" + cleanName;





            bool empty = false;

            bool empty = false;