diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-03-08 03:29:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-08 03:29:41 +0000 |
| commit | f97193d96f4a8badf31c716588d2545f65ae1d07 (patch) | |
| tree | 692272746908b0e2e6012a95e7b99f356059087e /adb | |
| parent | fc6e441a1a1a53b7021ca293d36d8c9d415cdd42 (diff) | |
| parent | 02e94a4f76b7d2215205aaf08db688abca86f65f (diff) | |
| download | system_core-f97193d96f4a8badf31c716588d2545f65ae1d07.tar.gz system_core-f97193d96f4a8badf31c716588d2545f65ae1d07.tar.bz2 system_core-f97193d96f4a8badf31c716588d2545f65ae1d07.zip | |
Merge "Revert "Revert "adbd: switch the default USB implementation."""
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/daemon/usb.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp index 598f2cd37..a44ff43b6 100644 --- a/adb/daemon/usb.cpp +++ b/adb/daemon/usb.cpp @@ -654,9 +654,10 @@ static void usb_ffs_open_thread() { } void usb_init() { - if (!android::base::GetBoolProperty("persist.adb.nonblocking_ffs", false)) { - usb_init_legacy(); - } else { + bool use_nonblocking = android::base::GetBoolProperty("persist.adb.nonblocking_ffs", true); + if (use_nonblocking) { std::thread(usb_ffs_open_thread).detach(); + } else { + usb_init_legacy(); } } |