commit 0606f76d4b5a7efa583b5fda7181c3bb6fea61c1
author Josh Gao <jmgao@google.com> Thu Apr 19 14:59:11 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 19 14:59:11 2018 -0700
tree aa667024e61d965e567a5ffdb78026f0eec6a884
parent 6c122ff3e2a172bcc16c246d2adeeab0dc7da898
parent 46262521a79815434998f8811e04ea73d9bc9236

Merge "adb: don't error in handle_host_request if we can't acquire a transport." am: 224d965be0
am: 22bce1788e

Change-Id: Ia6833ef85c666b5fd4682051d9846e45c61cbaeb

adb/adb.cpp

diff --git a/adb/adb.cpp b/adb/adb.cpp
index 4fbfafb..38c11b9 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
@@ -1221,7 +1221,7 @@
     std::string error;
     atransport* t = acquire_one_transport(type, serial, transport_id, nullptr, &error);
     if (!t) {
-        return SendFail(reply_fd, error);
+        return -1;
     }
 
     int ret = handle_forward_request(service, t, reply_fd);