Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2a00f50 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

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

am: f2dd09ff

Change-Id: I3bdae32bb3350e3b1137f43b32559e9a13331b40
parents 353d0293 f2dd09ff
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;