| commit | 679e670e5c92d62abc1629584f0f90edfbeb13cb | [log] [tgz] |
|---|---|---|
| author | Roy Luo <royluo@google.com> | Wed Jun 21 21:16:51 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 21 21:16:51 2023 +0000 |
| tree | 6a7b1e108abc734df5ddfc1610bf1c23c93f7678 | |
| parent | d65601d1a63e36cb7f9cb639c9a827d91083b70d [diff] | |
| parent | 7f72b30e65d9f9c0136f62a7cfa37404f7baa1b7 [diff] |
Merge "fastboot: remove retries on invalid IO iterator in OSX" am: be65e040d4 am: 7f72b30e65 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2631070 Change-Id: I3c76d40359933c767f6f5a25f6ac7c4fa4b03151 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fastboot/usb_osx.cpp b/fastboot/usb_osx.cpp index 5b9e5c8..8b852f5 100644 --- a/fastboot/usb_osx.cpp +++ b/fastboot/usb_osx.cpp
@@ -436,12 +436,7 @@ 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);