diff options
| author | 2018-09-05 13:12:54 -0700 | |
|---|---|---|
| committer | 2018-09-05 13:12:54 -0700 | |
| commit | 30770258181122d48c2048c9e05db5f31c9bca59 (patch) | |
| tree | 5fec2130231c5af2b707efba3cbeab4a62373a82 | |
| parent | 2b9b5a77a9534e0f467f0aeaa8edc3b11078120e (diff) | |
| parent | 86b01402714b2cfffafdd4a56b1af396103b1fd7 (diff) | |
Merge "statsd: fix double close." am: 0b8f17b3ba am: 6547dad5ac
am: 86b0140271
Change-Id: I0377db4c1e5343355882e1cfea94d7e4d04159d1
| -rw-r--r-- | cmds/statsd/src/external/Perfetto.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/statsd/src/external/Perfetto.cpp b/cmds/statsd/src/external/Perfetto.cpp index e44351b39769..42cc543f18a8 100644 --- a/cmds/statsd/src/external/Perfetto.cpp +++ b/cmds/statsd/src/external/Perfetto.cpp @@ -105,9 +105,9 @@ bool CollectPerfettoTraceAndUploadToDropbox(const PerfettoDetails& config, readPipe.reset(); // Close the read end (owned by the child process). - // Using fopen() because fwrite() has the right logic to chunking write() + // Using fdopen() because fwrite() has the right logic to chunking write() // over a pipe (see __sfvwrite()). - FILE* writePipeStream = fdopen(writePipe.get(), "wb"); + FILE* writePipeStream = android::base::Fdopen(std::move(writePipe), "wb"); if (!writePipeStream) { ALOGE("fdopen() failed while calling the Perfetto client: %s", strerror(errno)); return false; |