diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-07-24 00:56:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-24 00:56:34 +0000 |
| commit | 278754aeacf4499bb184e8f3e9d49d402bf71ff9 (patch) | |
| tree | da38e637cca6e0f2dca67aec9126170c420c9428 | |
| parent | 69055b5a3704f21f475c163575526767544c3a82 (diff) | |
| parent | 63e8d9815f4a95b424cea30573a520f58b19960b (diff) | |
Merge "adb: switch from system_clock to steady_clock."
| -rw-r--r-- | adb/client/usb_linux.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/adb/client/usb_linux.cpp b/adb/client/usb_linux.cpp index 81b830643..17b4db159 100644 --- a/adb/client/usb_linux.cpp +++ b/adb/client/usb_linux.cpp @@ -324,7 +324,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) { 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; |