commit f2dd09ff5b30e6bb98fdee5234eb956be6ef6526
author Josh Gao <jmgao@google.com> Tue Jul 23 18:31:24 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jul 23 18:31:24 2019 -0700
tree 4a66b2c2fe3015e0d048fe90ee3723eaec0a826b
parent a589dd1e0a6a926e9f48e153f07aa8aa319940bb
parent 278754aeacf4499bb184e8f3e9d49d402bf71ff9

Merge "adb: switch from system_clock to steady_clock."
am: 278754aeac

Change-Id: Ifd0e99d4caade013ed809d21818fa5f5fc86f1bf

adb/client/usb_linux.cpp

diff --git a/adb/client/usb_linux.cpp b/adb/client/usb_linux.cpp
index 81b8306..17b4db1 100644
--- a/adb/client/usb_linux.cpp
+++ b/adb/client/usb_linux.cpp
@@ -324,7 +324,7 @@
 
     h->urb_out_busy = true;
     while (true) {
-        auto now = std::chrono::system_clock::now();
+        auto now = std::chrono::steady_clock::now();
         if (h->cv.wait_until(lock, now + 5s) == std::cv_status::timeout || h->dead) {
             // TODO: call USBDEVFS_DISCARDURB?
             errno = ETIMEDOUT;