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

am: f97193d96f

Change-Id: I398b7d627745e140263cca4e2835d4ef7bd03f1f
This commit is contained in:
Josh Gao 2019-03-07 20:42:02 -08:00 committed by android-build-merger
commit d9e3421558
1 changed files with 4 additions and 3 deletions

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