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

Commit 7709f8a5 authored by Felipe Leme's avatar Felipe Leme
Browse files

Added -p to uptime command on header (and changed it to run always) 

Test: manual verification
Test: mmm -j32 frameworks/native/cmds/dumpstate/ && adb sync && \
      adb shell /data/nativetest/dumpstate_test/dumpstate_test && \
      adb shell /data/nativetest64/dumpstate_test/dumpstate_test && \
      printf "\n\n#### GOOD NEWS, EVERYONE: ALL TESTS PASSED! ####\n"

Bug: 65205261

Change-Id: Ide1aa2dc9f3446f9597433867445dd07731ae563
parent 13dd603c

cmds/dumpstate/dumpstate.cpp

+3 −2
Original line number Diff line number Diff line
@@ -691,7 +691,9 @@ void Dumpstate::PrintHeader() const { 
    printf("Kernel: ");

    DumpFileToFd(STDOUT_FILENO, "", "/proc/version");

    printf("Command line: %s\n", strtok(cmdline_buf, "\n"));

    ds.RunCommand("UPTIME", {"uptime"}, CommandOptions::DEFAULT);

    printf("Uptime: ");

    RunCommandToFd(STDOUT_FILENO, "", {"uptime", "-p"},

                   CommandOptions::WithTimeout(1).Always().Build());

    printf("Bugreport format version: %s\n", version_.c_str());

    printf("Dumpstate info: id=%d pid=%d dry_run=%d args=%s extra_options=%s\n", id_, pid_,

           PropertiesHelper::IsDryRun(), args_.c_str(), extra_options_.c_str());
@@ -1093,7 +1095,6 @@ static void dumpstate() { 
    DurationReporter duration_reporter("DUMPSTATE");



    dump_dev_files("TRUSTY VERSION", "/sys/bus/platform/drivers/trusty", "trusty_version");

    /* TODO: Remove duplicate uptime call when tools use it from header */

    RunCommand("UPTIME", {"uptime"});

    DumpBlockStatFiles();

    dump_emmc_ecsd("/d/mmc0/mmc0:0001/ext_csd");