commit e9f8fb0fc82df480aabf76201c9444887a41435e
author Josh Gao <jmgao@google.com> Tue Feb 26 14:29:36 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 26 14:29:36 2019 -0800
tree 34f04459480d71cb513a49fb6be05c256621c909
parent 7acf90c93a03ddbea5a98f8344961e115e0c2b30
parent 677016507c2949d410444ce7f47c96ad36ec47a2

Merge "Revert "adbd: switch the default USB implementation."" am: c2970282cb
am: b7d775866c

Change-Id: Idf5e30a236b394fcae7072e3f10a171dc549fb86

adb/daemon/usb.cpp

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