Merge "Merge cherrypicks of [1326087, 1326294] into sdk-release" into sdk-release

1 files changed, 9 insertions, 4 deletions

diff --git a/adb/client/incremental.cpp b/adb/client/incremental.cpp
index a8b0ab3d0..897c7e5de 100644
--- a/adb/client/incremental.cpp
+++ b/adb/client/incremental.cpp
@@ -164,7 +164,7 @@ std::optional<Process> install(const Files& files, const Args& passthrough_args,
     int print_fds[2];
     if (adb_socketpair(print_fds) != 0) {
         if (!silent) {
-            fprintf(stderr, "Failed to create socket pair for child to print to parent\n");
+            fprintf(stderr, "adb: failed to create socket pair for child to print to parent\n");
         }
         return {};
     }
@@ -191,10 +191,15 @@ std::optional<Process> install(const Files& files, const Args& passthrough_args,
     Result result = wait_for_installation(pipe_read_fd);
     adb_close(pipe_read_fd);
 
-    if (result == Result::Success) {
-        // adb client exits now but inc-server can continue
-        serverKiller.release();
+    if (result != Result::Success) {
+        if (!silent) {
+            fprintf(stderr, "adb: install command failed");
+        }
+        return {};
     }
+
+    // adb client exits now but inc-server can continue
+    serverKiller.release();
     return child;
 }