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

This commit is contained in:
Treehugger Robot 2019-03-08 03:29:41 +00:00 committed by Gerrit Code Review
commit f97193d96f

View file

@ -654,9 +654,10 @@ static void usb_ffs_open_thread() {
} }
void usb_init() { void usb_init() {
if (!android::base::GetBoolProperty("persist.adb.nonblocking_ffs", false)) { bool use_nonblocking = android::base::GetBoolProperty("persist.adb.nonblocking_ffs", true);
usb_init_legacy(); if (use_nonblocking) {
} else {
std::thread(usb_ffs_open_thread).detach(); std::thread(usb_ffs_open_thread).detach();
} else {
usb_init_legacy();
} }
} }