| commit | 7f72b30e65d9f9c0136f62a7cfa37404f7baa1b7 | [log] [tgz] |
|---|---|---|
| author | Roy Luo <royluo@google.com> | Wed Jun 21 20:35:30 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 21 20:35:30 2023 +0000 |
| tree | 6a7b1e108abc734df5ddfc1610bf1c23c93f7678 | |
| parent | 867458fa6bb68fde950e032ad52c5dbf8c55390b [diff] | |
| parent | be65e040d48250b939359a3e4845b5800b6eb462 [diff] |
Merge "fastboot: remove retries on invalid IO iterator in OSX" am: be65e040d4 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2631070 Change-Id: I72e150f757da768780af09bc2484bf21c95a59b5 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);