Merge "adbd: switch the default USB implementation." am: 5782600271 am: 269ef5d068

am: d4c49c4b44

Change-Id: I85adc4e8d270a6c71dbd0266ba330df6c37b2faf
This commit is contained in:
Josh Gao 2019-02-26 01:21:38 -08:00 committed by android-build-merger
commit 88c3bd5c83

View file

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