Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a lambda capture problem in TextDumpsysSection" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-05 18:17:22 +00:00
committed by Android (Google) Code Review
parent 4757e89277 4686c24f53
commit 35a18b50c5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmds/incidentd/src/Section.cpp
View File

@@ -477,14 +477,15 @@ status_t TextDumpsysSection::Execute(ReportWriter* writer) const {
// Run dumping thread // Run dumping thread
const uint64_t start = Nanotime(); const uint64_t start = Nanotime();
std::thread worker([&]() { std::thread worker([write_fd = std::move(dumpPipe.writeFd()), service = std::move(service),
this]() mutable {
// Don't crash the service if writing to a closed pipe (may happen if dumping times out) // Don't crash the service if writing to a closed pipe (may happen if dumping times out)
signal(SIGPIPE, sigpipe_handler); signal(SIGPIPE, sigpipe_handler);
status_t err = service->dump(dumpPipe.writeFd().get(), mArgs); status_t err = service->dump(write_fd.get(), this->mArgs);
if (err != OK) { if (err != OK) {
ALOGW("[%s] dump thread failed. Error: %s", this->name.string(), strerror(-err)); ALOGW("[%s] dump thread failed. Error: %s", this->name.string(), strerror(-err));
} }
dumpPipe.writeFd().reset(); write_fd.reset();
}); });
// Collect dump content // Collect dump content