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

Commit 558bf263 authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

Merge "NativeHandle.java: dup() with O_CLOEXEC" am: 760e074e

am: d5a101dd

Change-Id: If4b615a9a2d35d4f9c294bffa470fe6aed90a9f6
parents 5ee229c9 d5a101dd
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@

package android.os;

import static android.system.OsConstants.F_DUPFD_CLOEXEC;

import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.system.ErrnoException;
@@ -108,7 +110,10 @@ public final class NativeHandle implements Closeable {
        FileDescriptor[] fds = new FileDescriptor[mFds.length];
        try {
            for (int i = 0; i < mFds.length; i++) {
                fds[i] = Os.dup(mFds[i]);
                FileDescriptor newFd = new FileDescriptor();
                int fdint = Os.fcntlInt(mFds[i], F_DUPFD_CLOEXEC, 0);
                newFd.setInt$(fdint);
                fds[i] = newFd;
            }
        } catch (ErrnoException e) {
            e.rethrowAsIOException();