commit c48d9aba0b10b44256bb47e90c1cb912afd6214d
author Josh Gao <jmgao@google.com> Tue Feb 26 00:12:43 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 26 00:12:43 2019 -0800
tree 6528a41603085a409aa7f142e57a1543f64af5a1
parent 4eecb4eccdd62ccd58525e2bdfda5521131b0c20
parent db3b70c2286cfab89ee8f3037227d1935fc70b28

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

Change-Id: Idbc6eba721e06bfa4659f2aac1592f6bdf84a9a5

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();
     }
 }