From 0d780391a1602535ff83bb80fd7f2c3f6a6848c2 Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Tue, 26 Feb 2019 22:10:33 +0000
Subject: [PATCH] Revert "adbd: switch the default USB implementation."

This reverts commit 12f328489b4642162a427c6d8d3b13af48ad825b.

Reason for revert: possibly causing b/126388431

Change-Id: Ida7c30a92f552f923f3bcb153d945d58ebbc4257
---
 adb/daemon/usb.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index 69d1c3149..f0e286103 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -628,10 +628,9 @@ static void usb_ffs_open_thread() {
 }
 
 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();
     }
 }