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

Commit 69ec3ac3 authored by Andreas Huber's avatar Andreas Huber
Browse files

Use lshal's new --debug option when emitting bugreports. 

This calls into live binderized services and logs their "IBase::debug(...)"
output.

Bug: 36520620
Test: make, adb shell lshal, adb shell bugreport
Change-Id: I421e30e74c82817adf276b5750ce40038852df83
parent 5f8e45a1

cmds/dumpstate/dumpstate.cpp

+14 −1
Original line number Original line Diff line number Diff line
@@ -112,6 +112,7 @@ static const std::string ZIP_ROOT_DIR = "FS"; 




// Must be hardcoded because dumpstate HAL implementation need SELinux access to it

// Must be hardcoded because dumpstate HAL implementation need SELinux access to it

static const std::string kDumpstateBoardPath = "/bugreports/dumpstate_board.txt";

static const std::string kDumpstateBoardPath = "/bugreports/dumpstate_board.txt";

static const std::string kLsHalDebugPath = "/bugreports/dumpstate_lshal.txt";





static constexpr char PROPERTY_EXTRA_OPTIONS[] = "dumpstate.options";

static constexpr char PROPERTY_EXTRA_OPTIONS[] = "dumpstate.options";

static constexpr char PROPERTY_LAST_ID[] = "dumpstate.last_id";

static constexpr char PROPERTY_LAST_ID[] = "dumpstate.last_id";
@@ -962,7 +963,19 @@ static void dumpstate() { 
               {"ps", "-A", "-T", "-Z", "-O", "pri,nice,rtprio,sched,pcy"});

               {"ps", "-A", "-T", "-Z", "-O", "pri,nice,rtprio,sched,pcy"});

    RunCommand("LIBRANK", {"librank"}, CommandOptions::AS_ROOT);

    RunCommand("LIBRANK", {"librank"}, CommandOptions::AS_ROOT);





    RunCommand("HARDWARE HALS", {"lshal"}, CommandOptions::AS_ROOT);

    if (ds.IsZipping()) {

        RunCommand(

                "HARDWARE HALS",

                {"lshal", std::string("--debug=") + kLsHalDebugPath},

                CommandOptions::AS_ROOT);



        ds.AddZipEntry("lshal-debug.txt", kLsHalDebugPath);



        unlink(kLsHalDebugPath.c_str());

    } else {

        RunCommand(

                "HARDWARE HALS", {"lshal", "--debug"}, CommandOptions::AS_ROOT);

    }





    RunCommand("PRINTENV", {"printenv"});

    RunCommand("PRINTENV", {"printenv"});

    RunCommand("NETSTAT", {"netstat", "-nW"});

    RunCommand("NETSTAT", {"netstat", "-nW"});