commit daef77ed4caf901d0570fe4f5823ab38739a64a7
author Tom Cherry <tomcherry@google.com> Thu Jan 04 17:16:03 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 04 17:16:03 2018 +0000
tree ba62a01402a8e72983a0278dc49726aff7ed53b8
parent b22c5a1aa94b7f06d56f0d5a53fcd6e8cee2e20c
parent 2b4d5e69588b57b4c644ce196186af546911cc0c

Merge "system property: property set without time spent asleep" am: 0f65650859
am: 2b4d5e6958

Change-Id: Ia82dbaf01943f29d4f50cc133137b62184b15860

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 4b6c502..439ab39 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -350,13 +350,15 @@
     ufds[0].events = POLLIN;
     ufds[0].revents = 0;
     while (*timeout_ms > 0) {
-      Timer timer;
-      int nr = poll(ufds, 1, *timeout_ms);
-      uint64_t millis = timer.duration().count();
-      *timeout_ms = (millis > *timeout_ms) ? 0 : *timeout_ms - millis;
+        auto start_time = std::chrono::steady_clock::now();
+        int nr = poll(ufds, 1, *timeout_ms);
+        auto now = std::chrono::steady_clock::now();
+        auto time_elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(now - start_time);
+        uint64_t millis = time_elapsed.count();
+        *timeout_ms = (millis > *timeout_ms) ? 0 : *timeout_ms - millis;
 
-      if (nr > 0) {
-        return true;
+        if (nr > 0) {
+            return true;
       }
 
       if (nr == 0) {