Merge "Avoid to call UI functions in child process" am: 0f275ae56e am: 5fa2e576f9

am: 15ab95bb63

Change-Id: Ifedf5d53d6ff11ecfeda4a8a1fe7f4e802c9e152
This commit is contained in:
Tianjie Xu 2017-02-03 22:16:19 +00:00 committed by android-build-merger
commit 5eaf3cd966

View file

@ -382,7 +382,11 @@ static int try_update_binary(const char* path, ZipArchiveHandle zip, bool* wipe_
umask(022);
close(pipefd[0]);
execv(chr_args[0], const_cast<char**>(chr_args));
PLOG(ERROR) << "Can't run " << chr_args[0];
// Bug: 34769056
// We shouldn't use LOG/PLOG in the forked process, since they may cause
// the child process to hang. This deadlock results from an improperly
// copied mutex in the ui functions.
fprintf(stdout, "E:Can't run %s (%s)\n", chr_args[0], strerror(errno));
_exit(-1);
}
close(pipefd[1]);