commit 085788fab112506f0dfc9b531f65407600724688
author Josh Gao <jmgao@google.com> Wed May 01 16:53:53 2019 -0700
committer Josh Gao <jmgao@google.com> Thu May 02 14:13:14 2019 -0700
tree df988536544dcb88bbd335deed73d64d3a032630
parent f6c12769d6c1514c02d116ad4691806b84b69b40

adbd: avoid starting multiple worker threads.

A previous patch intended to make receiving multiple FUNCTIONFS_ENABLEs
non-fatal, but failed to do so because we would try to spawn another
worker thread and hit a different assertion.

Bug: http://b/130638368
Test: echo mem | adb shell "su 0 sh -c 'cat > /sys/power/state'"
Change-Id: I53456112244d8b4f7d26df6ec6961389fca70498
(cherry picked from commit 910ce0ff0852418c1a1e126bf0b083dcf24d5899)

adb/daemon/usb.cpp

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index 3b29ab5..e6a19a5 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -308,11 +308,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;
@@ -322,11 +324,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;