commit 6bb8e712581efcbc1a2f1d092d61856cc5fdc2b3
author Josh Gao <jmgao@google.com> Tue Feb 26 01:03:36 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 26 01:03:36 2019 -0800
tree 6528a41603085a409aa7f142e57a1543f64af5a1
parent 755c1d3d65623a87d9821dde181afeee40a1e801
parent c48d9aba0b10b44256bb47e90c1cb912afd6214d

Merge "adbd: switch the default USB implementation." am: 5782600271
am: 269ef5d068

Change-Id: I479f1de000ad2c9732550e0dc78a23ece811ff16

adb/daemon/usb.cpp

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index f0e2861..69d1c31 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -628,9 +628,10 @@
 }
 
 void usb_init() {
-    if (!android::base::GetBoolProperty("persist.adb.nonblocking_ffs", false)) {
-        usb_init_legacy();
-    } else {
+    bool use_nonblocking = android::base::GetBoolProperty("persist.adb.nonblocking_ffs", true);
+    if (use_nonblocking) {
         std::thread(usb_ffs_open_thread).detach();
+    } else {
+        usb_init_legacy();
     }
 }