summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Josh Gao <jmgao@google.com> 2018-09-05 12:34:31 -0700
committer android-build-merger <android-build-merger@google.com> 2018-09-05 12:34:31 -0700
commit86b01402714b2cfffafdd4a56b1af396103b1fd7 (patch)
tree7c8e5a98b7ff9018078aa51381dd2a8b52162f9a
parentd20588332d546ff9b7f145a45b00ebf05c37d9fe (diff)
parent6547dad5ac0ca56c99128d007b8d9ce419e82cc0 (diff)
Merge "statsd: fix double close." am: 0b8f17b3ba
am: 6547dad5ac Change-Id: Ida7fc9c7f7e01d6993361c0734f71d1d13d97158
-rw-r--r--cmds/statsd/src/external/Perfetto.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/statsd/src/external/Perfetto.cpp b/cmds/statsd/src/external/Perfetto.cpp
index 05544837b752..c1f9a643e153 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;