commit a34bb422743ed02ed34e50c60314eeae58ae52e1
author pengzhicai <pengzhicai@xiaomi.com> Tue Nov 07 02:13:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 07 02:13:37 2017 +0000
tree 8a30f349dae02f569b69b35b7dbde6a32a2d6528
parent a49025e4027c33d41b395ec38d0bf64ac681d46e
parent c9287b72312fd86c9b87ad5532b81f00915641e5

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

Change-Id: If973200321c88c555596bd58fd9137c05f938556

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 4d703fc..e792942 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());
@@ -1058,6 +1059,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");