commit 37b1d279e34cc0de99fd83aae6ee7654c1daf549
author Josh Gao <jmgao@google.com> Tue Feb 26 22:15:40 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 26 22:15:40 2019 +0000
tree 28b9cd4393673a35d6f6cbed8804935b51267770
parent 5c2458c23e8da742a92d072d3816deb3142f1b5f
parent 32242236fda74514b442550e6226811f9c361f3e

Merge "Revert "adbd: switch the default USB implementation.""

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