ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adb: treat non-successful inc-server runs as failures" am: ff502379b7

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1322109

Change-Id: I3b07d7f84a4c31ca559abbea12f7e497bf64a282
This commit is contained in:
Treehugger Robot 2020-06-03 21:40:22 +00:00 • committed by Automerger Merge Worker
commit f24a7e1f62
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
adb/client/incremental.cpp
View file

@ -180,7 +180,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 {};
}
@ -207,10 +207,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;
}