commit cfb04ff7877dc68c6d2f9dc54daa2f7f8cd74820
author Josh Gao <jmgao@google.com> Tue Mar 19 12:51:09 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 19 12:51:09 2019 -0700
tree 55cbc5c019d3c688968a8960e6f1af5940b6f32d
parent 22c5fbb370f7117945529440289884202178a19f
parent 65e7a09470102cb65fa7cee3691ddaf34c4c857d

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

Change-Id: Ib8bd70545cbb5acbf4ed9d1f3272b9e0fa8a421b

adb/daemon/usb.cpp

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index d07a007..b42236e 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -640,7 +640,10 @@
 }
 
 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 {