ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adb/daemon/usb.cpp
View file

@ -654,9 +654,10 @@ static void usb_ffs_open_thread() {
} }
void usb_init() { void usb_init() {
if (!android::base::GetBoolProperty("persist.adb.nonblocking_ffs", false)) { bool use_nonblocking = android::base::GetBoolProperty("persist.adb.nonblocking_ffs", true);
usb_init_legacy(); if (use_nonblocking) {
} else {
std::thread(usb_ffs_open_thread).detach(); std::thread(usb_ffs_open_thread).detach();
} else {
usb_init_legacy();
} }
} }