Merge "adbd: avoid starting multiple worker threads." into qt-dev

am: 5b882637e1

Change-Id: I073e5b7c608e153286a4f146b376a4b1dc64777a
This commit is contained in:
Josh Gao 2019-05-20 17:41:55 -07:00 committed by android-build-merger
commit bec7df797b

View file

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