commit c9b6375eedc0844f5dc8d7a1cf6cc408880b5672
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 21 00:04:15 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 21 00:04:15 2019 +0000
tree 645ef3d8b8f00c5c3adbae8c2b2321c53e37e58c
parent 22489c4dbdf00cefe0a3875a8a2a13573bdfe0c9
parent 085788fab112506f0dfc9b531f65407600724688

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

adb/daemon/usb.cpp

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index da04db1..b8ace44 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -314,11 +314,13 @@
                         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 @@
                         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;