summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2017-02-03 23:18:50 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-02-03 23:18:50 +0100
commit8e81a98a71b6ef761359acf6fcb728f7e2d3e226 (patch)
tree3812ca5760f4ea1593bbf2b63d3d7d175338d6d4
parentMerge "update_verifier should read dm wrapped partition" am: c44c479197 am: d40cd0e7cf am: a8764c46aa (diff)
parentMerge "Avoid to call UI functions in child process" am: 0f275ae56e am: 5fa2e576f9 (diff)
downloadandroid_bootable_recovery-8e81a98a71b6ef761359acf6fcb728f7e2d3e226.tar
android_bootable_recovery-8e81a98a71b6ef761359acf6fcb728f7e2d3e226.tar.gz
android_bootable_recovery-8e81a98a71b6ef761359acf6fcb728f7e2d3e226.tar.bz2
android_bootable_recovery-8e81a98a71b6ef761359acf6fcb728f7e2d3e226.tar.lz
android_bootable_recovery-8e81a98a71b6ef761359acf6fcb728f7e2d3e226.tar.xz
android_bootable_recovery-8e81a98a71b6ef761359acf6fcb728f7e2d3e226.tar.zst
android_bootable_recovery-8e81a98a71b6ef761359acf6fcb728f7e2d3e226.zip
Diffstat (limited to '')
-rw-r--r--install.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/install.cpp b/install.cpp
index 553ebae10..248a1336e 100644
--- a/install.cpp
+++ b/install.cpp
@@ -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]);