Merge changes I1118f2e2,I6c039b32 into rvc-dev am: d4c8a20d4b (5c79d3cc) · Commits · e / os / android_system_core

adb/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -567,7 +567,6 @@ cc_library {
		cc_binary {
		name: "adbd",
		defaults: ["adbd_defaults", "host_adbd_supported", "libadbd_binary_dependencies"],
		stl: "libc++_static",
		recovery_available: true,
		apex_available: ["com.android.adbd"],

+11 −3

Original line number	Diff line number	Diff line
		@@ -231,7 +231,14 @@ struct UsbFfsConnection : public Connection {
		offset += write_size;
		}
		}
		SubmitWrites();

		// Wake up the worker thread to submit writes.
		uint64_t notify = 1;
		ssize_t rc = adb_write(worker_event_fd_.get(), &notify, sizeof(notify));
		if (rc < 0) {
		PLOG(FATAL) << "failed to notify worker eventfd to submit writes";
		}

		return true;
		}

		@@ -443,6 +450,9 @@ struct UsbFfsConnection : public Connection {
		}

		ReadEvents();

		std::lock_guard<std::mutex> lock(write_mutex_);
		SubmitWrites();
		}
		});
		}
		@@ -626,8 +636,6 @@ struct UsbFfsConnection : public Connection {
		write_requests_.erase(it);
		size_t outstanding_writes = --writes_submitted_;
		LOG(DEBUG) << "USB write: reaped, down to " << outstanding_writes;

		SubmitWrites();
		}

		IoWriteBlock CreateWriteBlock(std::shared_ptr<Block> payload, size_t offset, size_t len,