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

Commit 84864e85 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:... 

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

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



Change-Id: Ia0394b0225063c47fecdbdf1561395e85d0a145a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 842c9379 bb3658a5

cmds/dumpstate/dumpstate.cpp

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

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

            std::string cleanName = interface;

            std::replace_if(cleanName.begin(),

                            cleanName.end(),

            std::replace_if(

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

                [](char c) {

                                return !isalnum(c) &&

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

                            }, '_');

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

                },

                '_');

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



            bool empty = false;