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."" am: c2970282cb am: b7d775866c

Browse source 
am: 093d5c34a5

Change-Id: I70c93faf116d9acdaf9852d286ecc64e87ecc05c
This commit is contained in:
Josh Gao 2019-02-26 14:39:12 -08:00 • committed by android-build-merger
commit 7975e1812d
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() {
bool use_nonblocking = android::base::GetBoolProperty("persist.adb.nonblocking_ffs", true);
if (use_nonblocking) {
std::thread(usb_ffs_open_thread).detach();
} else {
if (!android::base::GetBoolProperty("persist.adb.nonblocking_ffs", false)) {
usb_init_legacy();
} else {
std::thread(usb_ffs_open_thread).detach();
}
}