summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--adb/daemon/usb.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index d07a00709..b42236ece 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -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 {