commit 240809f3709d0705a848d34d3f76dff55f9796c9
author Josh Gao <jmgao@google.com> Thu Mar 07 20:53:32 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Mar 07 20:53:32 2019 -0800
tree 17dd6cc65f9be766e4e4a065adf31b4a02f5ceb7
parent 86148cc513ae1becaec668a6625450419bd0ebe1
parent caec34ac502f29430a9a1b4fbb8e088059e6b4fa

Merge "Revert "Revert "adbd: switch the default USB implementation.""" am: f97193d96f
am: d9e3421558

Change-Id: I1a742436986ce08235f1d6b5901afd3a33f26d2b

adb/daemon/usb.cpp

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index 598f2cd..a44ff43 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -654,9 +654,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();
     }
 }