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

am: c94cec6d9d

Change-Id: Ifd92439c031bf0627740cd87e045b410b7bf19b8
This commit is contained in:
Josh Gao 2019-03-19 12:55:36 -07:00 committed by android-build-merger
commit 1e43373c62

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 {