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

Commit 01c9903c 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 

am: d2a00f50

Change-Id: Idb515121eef29fca0fe55d2b5e5d073e27235a6b
parents fbd9760b d2a00f50

adb/client/usb_linux.cpp

+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;