Merge "adbd: support ro.adb.nonblocking_ffs."

am: affe351420

Change-Id: Ib8bd70545cbb5acbf4ed9d1f3272b9e0fa8a421b
This commit is contained in:
Josh Gao 2019-03-19 12:51:09 -07:00 committed by android-build-merger
commit c94cec6d9d

View file

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