commit cb26e8c185b90c173b04aa4b8525b9c398475b66
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 19 21:40:57 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 19 21:40:57 2018 +0000
tree cc077dc5100cce402848f723e33aaed6acd11536
parent 8bc1146bae96f041f2d4c3487eb9d0e96d7d6b46
parent 1606bc926d5aea6d486d780d4735c1c99d09c081

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

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