ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port ADB's new handling of the USB packet ClearFeature(HALT) to Fastboot.

Browse source 
This patch addresses Fastboot/Fastbootd connection issues seen on ARM Mac devices.

Original ADB patch: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/1699250/

Bug: 238779161
Test: 'fastboot update <path_to_update_archive>.zip' now works on ARM Mac.

Signed-off-by: Nicolas Gagnon <nicolasgagnon@google.com>
Merged-In: Id67904d91abc8b66ef1a00962e1fd57c97df98a7
Change-Id: Id67904d91abc8b66ef1a00962e1fd57c97df98a7
(cherry picked from commit 3efef5694ee242f0fbeeaaa15c128dfb84418798)
This commit is contained in:
Nicolas Gagnon 2022-09-14 17:48:18 +00:00 • committed by Keith Mok
parent 8ea0c2e276
commit bc680ab1fa
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fastboot/device/usb.cpp
View file

@ -171,6 +171,16 @@ static int usb_ffs_do_aio(usb_handle* h, const void* data, int len, bool read) {
if (num_bufs == 1 && aiob->events[0].res == -EINTR) {
continue;
}
if (read && aiob->events[0].res == -EPIPE) {
// On initial connection, some clients will send a ClearFeature(HALT) to
// attempt to resynchronize host and device after the fastboot server is killed.
// On newer device kernels, the reads we've already dispatched will be cancelled.
// Instead of treating this as a failure, which will tear down the interface and
// lead to the client doing the same thing again, just resubmit if this happens
// before we've actually read anything.
PLOG(ERROR) << "aio: got -EPIPE on first read attempt. Re-submitting read... ";
continue;
}
int ret = 0;
for (int i = 0; i < num_bufs; i++) {
if (aiob->events[i].res < 0) {