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

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

Browse source 
am: c2970282cb

Change-Id: I55b9fa99642980d229623b0b1231b448b79f97b6
This commit is contained in:
Josh Gao 2019-02-26 14:21:23 -08:00 • committed by android-build-merger
commit b7d775866c
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adb/daemon/usb.cpp
View file

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