commit 0a8ac0f91cf07d9afc215233cec9ace2bf44adc0
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 28 02:02:33 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 28 02:02:33 2020 +0000
tree 0eaa9917f45852f0a34e87f2e5d93f8f308727cc
parent 466691bed8140fba59e581600e71cdcb6c64e8bd
parent 73061b92fe797bc74e6576f976fe32476fcba41e

Merge "Fix minor time bug in ConsentCallback::getElapsedTimeMs" am: 3ed7588987 am: c17ca50b17 am: 73061b92fe

Change-Id: I647e27100bb1429b2fc1fd1ee474dc763d2cbbfb

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 fc94f23..a20db24 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -649,7 +649,7 @@
 }
 
 uint64_t Dumpstate::ConsentCallback::getElapsedTimeMs() const {
-    return Nanotime() - start_time_;
+    return (Nanotime() - start_time_) / NANOS_PER_MILLI;
 }
 
 void Dumpstate::PrintHeader() const {