Merge "Revert "Revert "adbd: switch the default USB implementation.""" am: f97193d96f am: d9e3421558

am: 3fafb971d9

Change-Id: Ie98d0d8b581fb53d0e7ecc64f55744fa851e3174
This commit is contained in:
Josh Gao 2019-03-07 21:14:18 -08:00 committed by android-build-merger
commit b1aa106e44

View file

@ -654,9 +654,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();
}
}