Commit: bec7df797b90248acea3014649ef07bf055ee2db - system-core (git)

system/core

Commit MetaInfo

• Revision: bec7df797b90248acea3014649ef07bf055ee2db (tree)
• Zeit: 2019-05-21 09:41:55
• Autor: Josh Gao <jmgao@goog...>
• Commiter: android-build-merger

Log Message

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

Change-Id: I073e5b7c608e153286a4f146b376a4b1dc64777a

Ändern Zusammenfassung

• modified: adb/daemon/usb.cpp

Diff

--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -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;