ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adb/daemon/usb.cpp
View file

@ -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;