DO NOT MERGE Android 8.0 stuff

Change-Id: I8c8a9734adbf36c33463123844fa6e078934ae34
2017-08-24 21:45:50 -05:00
parent c0c5c3a1a4
commit 95e8007578
9 changed files with 64 additions and 11 deletions
@@ -427,7 +427,11 @@ int MtpDataPacket::readDataAsync(struct usb_request *req) {

 // Wait for result of readDataAsync
 int MtpDataPacket::readDataWait(struct usb_device *device) {
+#ifdef HAS_USBHOST_TIMEOUT
+	struct usb_request *req = usb_request_wait(device, 200);
+#else
 	struct usb_request *req = usb_request_wait(device);
+#endif
 	return (req ? req->actual_length : -1);
 }