summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2018-05-22 19:17:32 -0500
committerGerrit Code Review2018-05-22 19:17:32 -0500
commit812a6b77c65a3fbeaa49235f907fdd90cf25d1de (patch)
treec03a1cf5e4de378355f92250fb3086da2fd4ab07
parent7a223584c5c72f7d16e6abc490125faa2349d98a (diff)
parent948b3e1068470cda390566452ccbaeb526a56e4e (diff)
downloadplatform-system-core-812a6b77c65a3fbeaa49235f907fdd90cf25d1de.tar.gz
platform-system-core-812a6b77c65a3fbeaa49235f907fdd90cf25d1de.tar.xz
platform-system-core-812a6b77c65a3fbeaa49235f907fdd90cf25d1de.zip
Merge "adb: add support for O_CLOEXEC to unique_fd pipe wrapper."
-rw-r--r--adb/adb_unique_fd.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/adb/adb_unique_fd.h b/adb/adb_unique_fd.h
index 9c02cbeec..0dd86872d 100644
--- a/adb/adb_unique_fd.h
+++ b/adb/adb_unique_fd.h
@@ -28,9 +28,9 @@ struct AdbCloser {
28using unique_fd = android::base::unique_fd_impl<AdbCloser>; 28using unique_fd = android::base::unique_fd_impl<AdbCloser>;
29 29
30#if !defined(_WIN32) 30#if !defined(_WIN32)
31inline bool Pipe(unique_fd* read, unique_fd* write) { 31inline bool Pipe(unique_fd* read, unique_fd* write, int flags = 0) {
32 int pipefd[2]; 32 int pipefd[2];
33 if (pipe(pipefd) != 0) { 33 if (pipe2(pipefd, flags) != 0) {
34 return false; 34 return false;
35 } 35 }
36 read->reset(pipefd[0]); 36 read->reset(pipefd[0]);