Merge remote-tracking branch 'origin/QCM6490.LA.3.0_T' into fp5-0324
Change-Id: I777c3057eb6db98075c8fead829b9d9ae227f31f
diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json
index 5339342..8ec9c12 100644
--- a/apex/apex_manifest.json
+++ b/apex/apex_manifest.json
@@ -1,5 +1,5 @@
{
"name": "com.android.adbd",
- "version": 339990000,
- "versionName": "339990000"
+ "version": 330400000,
+ "versionName": "330400000"
}
diff --git a/daemon/usb.cpp b/daemon/usb.cpp
index b2ae914..6c3f735 100644
--- a/daemon/usb.cpp
+++ b/daemon/usb.cpp
@@ -567,10 +567,6 @@
memcpy(&msg, block->payload.data(), sizeof(msg));
LOG(DEBUG) << "USB read:" << dump_header(&msg);
incoming_header_ = msg;
-
- if (msg.command == A_CNXN) {
- CancelWrites();
- }
} else {
size_t bytes_left = incoming_header_->data_length - incoming_payload_.size();
if (block->payload.size() > bytes_left) {
@@ -680,31 +676,6 @@
}
}
- void CancelWrites() {
- std::lock_guard<std::mutex> lock(write_mutex_);
- if (writes_submitted_ == 0) {
- return;
- }
-
- struct io_event res;
- struct iocb *w_iocb;
- size_t req_count = writes_submitted_;
-
- LOG(INFO) << "CancelWrites: writes_submitted_:" << writes_submitted_;
- for (size_t i = 0; i < req_count; ++i) {
- LOG(INFO) << "i:" << i <<", request.pending: " << write_requests_[i].pending;
- if (write_requests_[i].pending == true) {
- w_iocb = &write_requests_[i].control;
- LOG(INFO) << "cancelling w_iocb: " << static_cast<void*>(w_iocb);
- io_cancel(aio_context_.get(), w_iocb, &res);
- if (res.res < 0) {
- LOG(WARNING) << "failed to cancel w_iocb: " << static_cast<void*>(w_iocb)
- << ", with error: " << strerror(res.res);
- }
- }
- }
- }
-
void HandleError(const std::string& error) {
std::call_once(error_flag_, [&]() {
if (transport_) {
diff --git a/daemon/usb_ffs.cpp b/daemon/usb_ffs.cpp
index bd942b7..e538ca8 100644
--- a/daemon/usb_ffs.cpp
+++ b/daemon/usb_ffs.cpp
@@ -186,6 +186,7 @@
.source_comp = {
.bLength = sizeof(ss_descriptors.source_comp),
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
+ .bMaxBurst = 4,
},
.sink = {
.bLength = sizeof(ss_descriptors.sink),
@@ -197,6 +198,7 @@
.sink_comp = {
.bLength = sizeof(ss_descriptors.sink_comp),
.bDescriptorType = USB_DT_SS_ENDPOINT_COMP,
+ .bMaxBurst = 4,
},
};