commit ee899e0cac221a06bc126d7eb600d67c9608c752
author Josh Gao <jmgao@google.com> Thu Jun 01 15:34:21 2017 -0700
committer Josh Gao <jmgao@google.com> Wed Jun 07 11:29:14 2017 -0700
tree c4ed5da52f87e2c8cad5a8dfe4509f84d5d5b5af
parent 881bc9100225930b989de4a16d91020525fdddd2

adb: improve race between device_connected and device_disconnected.

If a device is unplugged while it's being processed, we can be inside
register_usb_transport still when we call unregister_usb_transport,
leading to bad things happening. Move the call of
register_usb_transport into the scope guarded by usb_handles_mutex.

Bug: http://b/62200735
Test: manual
Merged-In: I2517dcb9d30d9a08cebbb5f715ae3fd30c510109
Change-Id: I2517dcb9d30d9a08cebbb5f715ae3fd30c510109
(cherry picked from commit 7dd382ded948aa5adae3618f99d00c14c3703d05)

client/usb_libusb.cpp

diff --git a/client/usb_libusb.cpp b/client/usb_libusb.cpp
index b2fdc07..dc1a6b4 100644
--- a/client/usb_libusb.cpp
+++ b/client/usb_libusb.cpp
@@ -377,9 +377,10 @@
     {
         std::unique_lock<std::mutex> lock(usb_handles_mutex);
         usb_handles[device_address] = std::move(result);
-    }
 
-    register_usb_transport(usb_handle_raw, device_serial.c_str(), device_address.c_str(), writable);
+        register_usb_transport(usb_handle_raw, device_serial.c_str(), device_address.c_str(),
+                               writable);
+    }
     LOG(INFO) << "registered new usb device '" << device_serial << "'";
 }