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

This reverts commit 0d780391a1.

Reason for revert: cause for original revert probably fixed by https://android-review.googlesource.com/c/platform/system/core/+/914673

Change-Id: I9a7eead54fca3a1a9dfd93f650f01c056d39339e
This commit is contained in:
Josh Gao 2019-02-28 07:26:20 +00:00
parent 0d780391a1
commit 02e94a4f76

View file

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