diff options
| author | Tianjie Xu <xunchang@google.com> | 2017-02-03 23:12:19 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 23:12:19 +0100 |
| commit | 5fa2e576f9b922675b364afc58f34e11ec7f7ce7 (patch) | |
| tree | 142570fc6ca714cb049538cbf13e8660cc617530 | |
| parent | Merge "update_verifier should read dm wrapped partition" (diff) | |
| parent | Merge "Avoid to call UI functions in child process" (diff) | |
| download | android_bootable_recovery-5fa2e576f9b922675b364afc58f34e11ec7f7ce7.tar android_bootable_recovery-5fa2e576f9b922675b364afc58f34e11ec7f7ce7.tar.gz android_bootable_recovery-5fa2e576f9b922675b364afc58f34e11ec7f7ce7.tar.bz2 android_bootable_recovery-5fa2e576f9b922675b364afc58f34e11ec7f7ce7.tar.lz android_bootable_recovery-5fa2e576f9b922675b364afc58f34e11ec7f7ce7.tar.xz android_bootable_recovery-5fa2e576f9b922675b364afc58f34e11ec7f7ce7.tar.zst android_bootable_recovery-5fa2e576f9b922675b364afc58f34e11ec7f7ce7.zip | |
| -rw-r--r-- | install.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/install.cpp b/install.cpp index 959a74222..91e4875cb 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]); |