Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49b74864 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "Revert "adb: add support for O_CLOEXEC to unique_fd pipe wrapper."" am:... 

Merge "Revert "adb: add support for O_CLOEXEC to unique_fd pipe wrapper."" am: a2157a7d am: e7a456ff
am: b9d6bebf

Change-Id: I4433bd37b4f33210e77b46a140cd4cb96085768d
parents 14bb398a b9d6bebf

adb/adb_unique_fd.h

+2 −2
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ struct AdbCloser { 
using unique_fd = android::base::unique_fd_impl<AdbCloser>;



#if !defined(_WIN32)

inline bool Pipe(unique_fd* read, unique_fd* write, int flags = 0) {

inline bool Pipe(unique_fd* read, unique_fd* write) {

    int pipefd[2];

    if (pipe2(pipefd, flags) != 0) {

    if (pipe(pipefd) != 0) {

        return false;

    }

    read->reset(pipefd[0]);