commit 51fd5440c1e4c1b9962aeea97effc8a98a7089ad
author Josh Gao <jmgao@google.com> Thu Apr 19 22:32:27 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 19 22:32:27 2018 +0000
tree eec92424dc53cb13b9ecbaf1bfb234e5b8118989
parent c415debdbf76f511af35f1bff3b00be938ce294c
parent 05e5bc1b1774ecce4a87f4221b835d8fd3f23585

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

adb/adb.cpp

diff --git a/adb/adb.cpp b/adb/adb.cpp
index 70e083b..c791c7b 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
@@ -1222,7 +1222,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);