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

Commit 9ebab104 authored by pengzhicai's avatar pengzhicai Committed by android-build-merger
Browse files

Merge "Put uptime into bugreport header" am: 7938fa4b am: c9287b72 

am: a34bb422

Change-Id: Ib2c46b11a2818fc54ecb2159f76bb48b79563b44
parents 4bb4454b a34bb422

cmds/dumpstate/dumpstate.cpp

+2 −0
Original line number Diff line number Diff line
@@ -690,6 +690,7 @@ 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("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());
@@ -1092,6 +1093,7 @@ 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");