From 02e94a4f76b7d2215205aaf08db688abca86f65f Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Thu, 28 Feb 2019 07:26:20 +0000 Subject: Revert "Revert "adbd: switch the default USB implementation."" This reverts commit 0d780391a1602535ff83bb80fd7f2c3f6a6848c2. Reason for revert: cause for original revert probably fixed by https://android-review.googlesource.com/c/platform/system/core/+/914673 Change-Id: I9a7eead54fca3a1a9dfd93f650f01c056d39339e --- adb/daemon/usb.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'adb') diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp index f0e286103..69d1c3149 100644 --- a/adb/daemon/usb.cpp +++ b/adb/daemon/usb.cpp @@ -628,9 +628,10 @@ static void usb_ffs_open_thread() { } 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(); } } -- cgit v1.2.3