Merge "adbd: avoid starting multiple worker threads." into qt-dev (5b882637) · Commits · e / os / android_system_core

adb/daemon/usb.cpp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -314,11 +314,13 @@ struct UsbFfsConnection : public Connection {
	if (bound) {		if (bound) {
	LOG(WARNING) << "received FUNCTIONFS_BIND while already bound?";		LOG(WARNING) << "received FUNCTIONFS_BIND while already bound?";
	running = false;		running = false;
			break;
	}		}

	if (enabled) {		if (enabled) {
	LOG(WARNING) << "received FUNCTIONFS_BIND while already enabled?";		LOG(WARNING) << "received FUNCTIONFS_BIND while already enabled?";
	running = false;		running = false;
			break;
	}		}

	bound = true;		bound = true;
	@@ -328,11 +330,13 @@ struct UsbFfsConnection : public Connection {
	if (!bound) {		if (!bound) {
	LOG(WARNING) << "received FUNCTIONFS_ENABLE while not bound?";		LOG(WARNING) << "received FUNCTIONFS_ENABLE while not bound?";
	running = false;		running = false;
			break;
	}		}

	if (enabled) {		if (enabled) {
	LOG(WARNING) << "received FUNCTIONFS_ENABLE while already enabled?";		LOG(WARNING) << "received FUNCTIONFS_ENABLE while already enabled?";
	running = false;		running = false;
			break;
	}		}

	enabled = true;		enabled = true;