commit 1e43373c62a7bb40a81f4f01385181aa3cc7cbb2
author Josh Gao <jmgao@google.com> Tue Mar 19 12:55:36 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 19 12:55:36 2019 -0700
tree 55cbc5c019d3c688968a8960e6f1af5940b6f32d
parent 8e9b7ffe3273854594ec6a1295efe370ebee0bfc
parent c94cec6d9d3da8b5969478162da5d6c3e3a2a2a6

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

Change-Id: Ifd92439c031bf0627740cd87e045b410b7bf19b8

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 {