Merge "Revert "Revert "adbd: switch the default USB implementation.""" am: f97193d96f
am: d9e3421558
Change-Id: I1a742436986ce08235f1d6b5901afd3a33f26d2b
This commit is contained in:
commit
3fafb971d9
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue