commit fb5fd5e8b312af2a02f8b8c90807ba4b4402c725
author Josh Gao <jmgao@google.com> Tue Feb 26 01:21:38 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 26 01:21:38 2019 -0800
tree af2c3cf559c0341a111828e8c0398771e736b314
parent af9a15d34d3dc6062cac61febf22693459fc8356
parent 6bb8e712581efcbc1a2f1d092d61856cc5fdc2b3

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

Change-Id: I85adc4e8d270a6c71dbd0266ba330df6c37b2faf

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