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

Merge "Port ADB's new handling of the USB packet ClearFeature(HALT) to Fastboot." am: 57ea923f30 am: 57fd8bef09 am: 98f63e3fd1 am: 7ab140d55b

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

Change-Id: I98603a6069066ee9e79961c19ed283613a40252f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nicolas Gagnon 2022-09-15 01:05:39 +00:00 • committed by Automerger Merge Worker
commit b3083b75d0
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

@ -161,6 +161,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) {