Merge "Revert "adbd: switch the default USB implementation.""
This commit is contained in:
commit
c2970282cb
1 changed files with 3 additions and 4 deletions
|
|
@ -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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue