commit f0a3905126e66cd7341b74c34bac1d3c32c1bf50
author Hunter Knepshield <hknepshield@google.com> Fri Jan 03 14:53:04 2020 -0800
committer Hunter Knepshield <hknepshield@google.com> Mon Jan 27 23:14:17 2020 +0000
tree 125591fbf10d3217371bdf7b335cea154571d563
parent ba879c75bd5228872d8f1e9cbde11536a36bc85b

Fix minor time bug in ConsentCallback::getElapsedTimeMs

Previously, this function was actually returning a value in nanoseconds,
which made any comparisons with milliseconds invalid. This in turn
caused the dumpstate routine to abort too early for bug reports that
finish before the default timeout elapses (e.g. wifi and telephony
report modes).

Fix: 147153946
Test: manual, ensure that an empty report still waits for 30 seconds
  (USER_CONSENT_TIMEOUT_MS) before cancelling the consent dialog

Change-Id: I2b610d3a32148f706e0b2fc2e330a879795fc8ad

cmds/dumpstate/DumpstateInternal.h

diff --git a/cmds/dumpstate/DumpstateInternal.h b/cmds/dumpstate/DumpstateInternal.h
index 10db5d6..c1ec55e 100644
--- a/cmds/dumpstate/DumpstateInternal.h
+++ b/cmds/dumpstate/DumpstateInternal.h
@@ -49,6 +49,7 @@
 
 // TODO: use functions from <chrono> instead
 const uint64_t NANOS_PER_SEC = 1000000000;
+const uint64_t NANOS_PER_MILLI = 1000000;
 uint64_t Nanotime();
 
 // Switches to non-root user and group.

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index d705fa8..585a98e 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -660,7 +660,7 @@
 }
 
 uint64_t Dumpstate::ConsentCallback::getElapsedTimeMs() const {
-    return Nanotime() - start_time_;
+    return (Nanotime() - start_time_) / NANOS_PER_MILLI;
 }
 
 void Dumpstate::PrintHeader() const {