commit 46262521a79815434998f8811e04ea73d9bc9236
author Josh Gao <jmgao@google.com> Thu Apr 19 14:52:57 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 19 14:52:57 2018 -0700
tree cc077dc5100cce402848f723e33aaed6acd11536
parent 6d39c3b1f5f28eb741640c8d565c4284f259f541
parent cb26e8c185b90c173b04aa4b8525b9c398475b66

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

Change-Id: If1d8207916095c9fbca83c716f51846f125897b9

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);