| commit | b7d782dd38ce7d903ae06cbc07ec9b63c3bbae5d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jul 24 00:56:34 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jul 24 00:56:34 2019 +0000 |
| tree | da38e637cca6e0f2dca67aec9126170c420c9428 | |
| parent | d47620bfebf0ba6416285f1bcb24f7c00e0eb755 [diff] | |
| parent | dc86e6061cc4475abcf4e8742f51e95fd1c9e26d [diff] |
Merge "adb: switch from system_clock to steady_clock."
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;