Merge "adbd: support ro.adb.nonblocking_ffs." am: affe351420 am: c94cec6d9d

am: 1e43373c62

Change-Id: Icdafb535240608d0e7ba927583c79199ef78747a
This commit is contained in:
Josh Gao 2019-03-19 13:10:35 -07:00 committed by android-build-merger
commit f31a12aa71

View file

@ -640,7 +640,10 @@ static void usb_ffs_open_thread() {
}
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) {
std::thread(usb_ffs_open_thread).detach();
} else {