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

Commit 679e670e authored by Roy Luo's avatar Roy Luo Committed by Automerger Merge Worker
Browse files

Merge "fastboot: remove retries on invalid IO iterator in OSX" am: be65e040 am: 7f72b30e 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2631070



Change-Id: I3c76d40359933c767f6f5a25f6ac7c4fa4b03151
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d65601d1 7f72b30e

fastboot/usb_osx.cpp

+1 −6
Original line number Diff line number Diff line
@@ -436,12 +436,7 @@ static int init_usb(ifc_match_func callback, std::unique_ptr<usb_handle>* handle 


    for (;;) {

        if (! IOIteratorIsValid(iterator)) {

            /*

             * Apple documentation advises resetting the iterator if

             * it should become invalid during iteration.

             */

            IOIteratorReset(iterator);

            continue;

            break;

        }



        io_service_t device = IOIteratorNext(iterator);