openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

adb: treat non-successful inc-server runs as failures 

This way if an unknown device returns anything but a clear
success report from an incremental installation adb would retry
non-incrementally

Bug: 158006039
Test: manual install on R and Q
Change-Id: I9950273bd60ba75fe12a3706d2ccbee136987d13
This commit is contained in:
Yurii Zubrytskyi 2020-06-02 23:38:51 -07:00
parent 450e83eb8f
commit 924915bacd
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;
}