From 8038e35fdf0f3706bf5a3d17b65302cddc021793 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Mon, 18 Mar 2019 16:33:18 -0700 Subject: [PATCH] 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp index f4458a2c8..1eade3913 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 {