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

Commit ab48925f authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by android-build-merger
Browse files

Merge "fix 'adb shell'" am: 1d284004

am: edf501ac

Change-Id: Iaf751eb70fc63987169b4390d5ec9c2628b6c1b4
parents 19b3c202 edf501ac
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -355,8 +355,8 @@ static __inline__ int get_fd_flags(borrowed_fd fd) {

static __inline__ void close_on_exec(borrowed_fd fd) {
    int flags = get_fd_flags(fd);
    if (flags >= 0 && (flags & O_CLOEXEC) == 0) {
        fcntl(fd.get(), F_SETFD, flags | O_CLOEXEC);
    if (flags >= 0 && (flags & FD_CLOEXEC) == 0) {
        fcntl(fd.get(), F_SETFD, flags | FD_CLOEXEC);
    }
}