commit c3b7758951f25d308a0bf4af51ef9206fbe9d6ac
author Josh Gao <jmgao@google.com> Mon Mar 18 16:33:18 2019 -0700
committer Josh Gao <jmgao@google.com> Mon Mar 18 17:59:24 2019 -0700
tree 6418748e14c6faecad7ba745a2680d0fe7a61b60
parent 51564e234bef6aac37a221f1a5dcbb409f2f6883

adbd: support ro.adb.nonblocking_ffs.

Allow disabling ro.adb.nonblocking_ffs via an ro system property, which
gets overridden by the currently supported persist.adb.nonblocking_ffs.

Bug: http://b/128679787
Test: mma
Change-Id: I28891d2da129e9654bf63ab8a4c330c4d2f5b336

adb/daemon/usb.cpp

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index f4458a2..1eade39 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 {