commit 9ebab104ddb09f52850c80517689ab67032146e2
author pengzhicai <pengzhicai@xiaomi.com> Tue Nov 07 02:22:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 07 02:22:08 2017 +0000
tree 7593aae9a670003e7864703ca32a1e8517560fe4
parent 4bb4454b8aa7fd2da787cf40572088c137fc808a
parent a34bb422743ed02ed34e50c60314eeae58ae52e1

Merge "Put uptime into bugreport header" am: 7938fa4bb0 am: c9287b7231
am: a34bb42274

Change-Id: Ib2c46b11a2818fc54ecb2159f76bb48b79563b44

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 380921d..b94d3d5 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -690,6 +690,7 @@
     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 @@
     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");