Merge "adbd: switch the default USB implementation." am: 5782600271
am: 269ef5d068
Change-Id: I479f1de000ad2c9732550e0dc78a23ece811ff16
This commit is contained in:
commit
d4c49c4b44
1 changed files with 4 additions and 3 deletions
|
@ -628,9 +628,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 a new issue