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
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 {