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

Commit d17dd5ed authored by David Anderson's avatar David Anderson Committed by android-build-merger
Browse files

Merge "dumpstate: Log logical partition metadata in bugreports" am: 45f75b71 am: ed8a1acb 

am: d60f0a41

Change-Id: I9e16111d3606614c517877c615199bd7a2f119c3
parents afb00d92 d60f0a41

cmds/dumpstate/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ cc_binary { 
        "kill",

        "librank",

        "logcat",

        "lpdump",

        "lpdumpd",

        "lsmod",

        "lsof",

        "netstat",

cmds/dumpstate/dumpstate.cpp

+9 −0
Original line number Diff line number Diff line
@@ -929,6 +929,14 @@ static void DumpIpTablesAsRoot() { 
    RunCommand("IP6TABLES RAW", {"ip6tables", "-t", "raw", "-L", "-nvx"});

}



static void DumpDynamicPartitionInfo() {

    if (!::android::base::GetBoolProperty("ro.boot.dynamic_partitions", false)) {

        return;

    }



    RunCommand("LPDUMP", {"lpdump", "--all"});

}



static void AddAnrTraceDir(const bool add_to_zip, const std::string& anr_traces_dir) {

    MYLOGD("AddAnrTraceDir(): dump_traces_file=%s, anr_traces_dir=%s\n", dump_traces_path,

           anr_traces_dir.c_str());
@@ -1515,6 +1523,7 @@ static Dumpstate::RunStatus DumpstateDefault() { 
    }

    add_mountinfo();

    DumpIpTablesAsRoot();

    DumpDynamicPartitionInfo();



    // Capture any IPSec policies in play. No keys are exposed here.

    RunCommand("IP XFRM POLICY", {"ip", "xfrm", "policy"}, CommandOptions::WithTimeout(10).Build());