summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Gao2018-05-23 11:45:31 -0500
committerGerrit Code Review2018-05-23 11:45:31 -0500
commita2157a7d92bddd893e03b60d32bf928306c6a10b (patch)
treed0ba5f670ad72a3b71b297922dea5cf45f6d90fe
parentad707b0222ed946804df3cb88f92f36abe8bec7b (diff)
parentf139ba47a13de0637732af9fd70aab0e8c877e45 (diff)
downloadplatform-system-core-a2157a7d92bddd893e03b60d32bf928306c6a10b.tar.gz
platform-system-core-a2157a7d92bddd893e03b60d32bf928306c6a10b.tar.xz
platform-system-core-a2157a7d92bddd893e03b60d32bf928306c6a10b.zip
Merge "Revert "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 0dd86872d..9c02cbeec 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, int flags = 0) { 31inline bool Pipe(unique_fd* read, unique_fd* write) {
32 int pipefd[2]; 32 int pipefd[2];
33 if (pipe2(pipefd, flags) != 0) { 33 if (pipe(pipefd) != 0) {
34 return false; 34 return false;
35 } 35 }
36 read->reset(pipefd[0]); 36 read->reset(pipefd[0]);