Update Icing from upstream.

Change-Id: Iff50aebffb83529b0454e7c3a6dc6864e7a85f4a

1 files changed, 8 insertions, 3 deletions

diff --git a/icing/util/clock.h b/icing/util/clock.h
index 06f1c9d..2bb7818 100644
--- a/icing/util/clock.h
+++ b/icing/util/clock.h
@@ -36,17 +36,22 @@ int64_t GetSteadyTimeMilliseconds();
 class Timer {
  public:
   // Creates and starts the timer.
-  Timer() : start_timestamp_milliseconds_(GetSteadyTimeMilliseconds()) {}
+  Timer() : start_timestamp_nanoseconds_(GetSteadyTimeNanoseconds()) {}
 
   virtual ~Timer() = default;
 
   // Returns the elapsed time from when timer started.
   virtual int64_t GetElapsedMilliseconds() {
-    return GetSteadyTimeMilliseconds() - start_timestamp_milliseconds_;
+    return GetElapsedNanoseconds() / 1000000;
+  }
+
+  // Returns the elapsed time from when timer started.
+  virtual int64_t GetElapsedNanoseconds() {
+    return GetSteadyTimeNanoseconds() - start_timestamp_nanoseconds_;
   }
 
  private:
-  int64_t start_timestamp_milliseconds_;
+  int64_t start_timestamp_nanoseconds_;
 };
 
 // Wrapper around real-time clock functions. This is separated primarily so