diff options
| author | Josh Gao <jmgao@google.com> | 2019-03-19 13:10:35 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-19 13:10:35 -0700 |
| commit | f31a12aa7156ca26c93b7a853b23fb5bf85c8d6d (patch) | |
| tree | 271c2db04388d53985cf8eb69c0db7406af1f523 /adb | |
| parent | 7d95981d97f805417c2133b73722a4361aa527ce (diff) | |
| parent | 1e43373c62a7bb40a81f4f01385181aa3cc7cbb2 (diff) | |
| download | system_core-f31a12aa7156ca26c93b7a853b23fb5bf85c8d6d.tar.gz system_core-f31a12aa7156ca26c93b7a853b23fb5bf85c8d6d.tar.bz2 system_core-f31a12aa7156ca26c93b7a853b23fb5bf85c8d6d.zip | |
Merge "adbd: support ro.adb.nonblocking_ffs." am: affe351420 am: c94cec6d9d
am: 1e43373c62
Change-Id: Icdafb535240608d0e7ba927583c79199ef78747a
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/daemon/usb.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp index d07a00709..b42236ece 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 { |