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

Commit 962036d2 authored by Nandana Dutt's avatar Nandana Dutt Committed by android-build-merger
Browse files

Merge changes I7f697d1d,I60f47a48 am: 6c101418 am: 7f4fc5e3 am: 066d04e7 

am: 57904549

Change-Id: Icab04db2862fbd08e01840f377b951f844ec8f2d
parents 5b725000 57904549

cmds/dumpstate/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -123,7 +123,6 @@ cc_binary { 
        "lsmod",

        "lsmod",

        "lsof",

        "lsof",

        "netstat",

        "netstat",

        "parse_radio_log",

        "printenv",

        "printenv",

        "procrank",

        "procrank",

        "screencap",

        "screencap",

cmds/dumpstate/dumpstate.cpp

+0 −3
Original line number Original line Diff line number Diff line
@@ -1316,8 +1316,6 @@ static Dumpstate::RunStatus dumpstate() { 




    RunCommand("FILESYSTEMS & FREE SPACE", {"df"});

    RunCommand("FILESYSTEMS & FREE SPACE", {"df"});





    RunCommand("LAST RADIO LOG", {"parse_radio_log", "/proc/last_radio_log"});



    /* Binder state is expensive to look at as it uses a lot of memory. */

    /* Binder state is expensive to look at as it uses a lot of memory. */

    DumpFile("BINDER FAILED TRANSACTION LOG", "/sys/kernel/debug/binder/failed_transaction_log");

    DumpFile("BINDER FAILED TRANSACTION LOG", "/sys/kernel/debug/binder/failed_transaction_log");

    DumpFile("BINDER TRANSACTION LOG", "/sys/kernel/debug/binder/transaction_log");

    DumpFile("BINDER TRANSACTION LOG", "/sys/kernel/debug/binder/transaction_log");
@@ -2294,7 +2292,6 @@ Dumpstate::RunStatus Dumpstate::DumpOptions::Initialize(int argc, char* argv[]) 
        }

        }

    }

    }





    // TODO: use helper function to convert argv into a string

    for (int i = 0; i < argc; i++) {

    for (int i = 0; i < argc; i++) {

        args += argv[i];

        args += argv[i];

        if (i < argc - 1) {

        if (i < argc - 1) {

cmds/dumpstate/dumpstate.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -441,8 +441,7 @@ class Dumpstate { 
    // Full path of the bugreport file, be it zip or text, inside bugreport_internal_dir_.

    // Full path of the bugreport file, be it zip or text, inside bugreport_internal_dir_.

    std::string path_;

    std::string path_;





    // TODO: If temporary this should be removed at the end.

    // Full path of the file containing the screenshot (when requested).

    // Full path of the temporary file containing the screenshot (when requested).

    std::string screenshot_path_;

    std::string screenshot_path_;





    // Pointer to the zipped file.

    // Pointer to the zipped file.