commit 99920cb302f1d0f9a81fb226567547955e68c7f1
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 1fa9088c643727b9aafc3505cafa068bbc16d619
parent 9e97113beb7cc5c8edef725b8a8301854be5f453

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

daemon/usb.cpp

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