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

This commit is contained in:
Josh Gao 2019-02-26 22:15:40 +00:00 committed by Gerrit Code Review
commit c2970282cb

View file

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