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

Commit 6ad9a603 authored by Nandana Dutt's avatar Nandana Dutt
Browse files

Dumpstate: Refactor DumpHals 

Prefactoring to handle user consent denial sooner.

BUG: 128270426
Test: "adb shell bugreport" for flat file bugreports works
Change-Id: Ifba9ec600ab7fe23b046414fd718220cd07a39d2
parent ea725593

cmds/dumpstate/dumpstate.cpp

+11 −16
Original line number Diff line number Diff line
@@ -1186,6 +1186,15 @@ static void RunDumpsysNormal() { 
}



static void DumpHals() {

    if (!ds.IsZipping()) {

        RunCommand("HARDWARE HALS", {"lshal", "-lVSietrpc", "--types=b,c,l,z", "--debug"},

                   CommandOptions::WithTimeout(10).AsRootIfAvailable().Build());

        return;

    }

    DurationReporter duration_reporter("DUMP HALS");

    RunCommand("HARDWARE HALS", {"lshal", "-lVSietrpc", "--types=b,c,l,z"},

               CommandOptions::WithTimeout(2).AsRootIfAvailable().Build());



    using android::hidl::manager::V1_0::IServiceManager;

    using android::hardware::defaultServiceManager;
@@ -1262,14 +1271,7 @@ static void dumpstate() { 
               {"ps", "-A", "-T", "-Z", "-O", "pri,nice,rtprio,sched,pcy,time"});

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



    if (ds.IsZipping()) {

        RunCommand("HARDWARE HALS", {"lshal", "-lVSietrpc", "--types=b,c,l,z"},

                   CommandOptions::WithTimeout(2).AsRootIfAvailable().Build());

    DumpHals();

    } else {

        RunCommand("HARDWARE HALS", {"lshal", "-lVSietrpc", "--types=b,c,l,z", "--debug"},

                   CommandOptions::WithTimeout(10).AsRootIfAvailable().Build());

    }



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

    RunCommand("NETSTAT", {"netstat", "-nW"});
@@ -1569,14 +1571,7 @@ static void DumpstateWifiOnly() { 
    RunDumpsys("DUMPSYS", {"wifi"}, CommandOptions::WithTimeout(90).Build(),

               SEC_TO_MSEC(10));



    if (ds.IsZipping()) {

        RunCommand("HARDWARE HALS", {"lshal", "-lVSietrpc", "--types=b,c,l,z"},

                   CommandOptions::WithTimeout(2).AsRootIfAvailable().Build());

    DumpHals();

    } else {

        RunCommand("HARDWARE HALS", {"lshal", "-lVSietrpc", "--types=b,c,l,z", "--debug"},

                   CommandOptions::WithTimeout(10).AsRootIfAvailable().Build());

    }



    printf("========================================================\n");

    printf("== dumpstate: done (id %d)\n", ds.id_);