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

Commit 97b24c2f authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)" 

am: f1d119cc

Change-Id: I90e74c457475f16edd20369bb8c024896c9e241c
parents a095ee3c f1d119cc

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -35356,6 +35356,7 @@ package android.system { 
    method public static void seteuid(int) throws android.system.ErrnoException;

    method public static void setgid(int) throws android.system.ErrnoException;

    method public static int setsid() throws android.system.ErrnoException;

    method public static void setsockoptInt(java.io.FileDescriptor, int, int, int) throws android.system.ErrnoException;

    method public static void setuid(int) throws android.system.ErrnoException;

    method public static void shutdown(java.io.FileDescriptor, int) throws android.system.ErrnoException;

    method public static java.io.FileDescriptor socket(int, int, int) throws android.system.ErrnoException;
@@ -35766,6 +35767,7 @@ package android.system { 
    field public static final int S_IXOTH;

    field public static final int S_IXUSR;

    field public static final int TCP_NODELAY;

    field public static final int TCP_USER_TIMEOUT;

    field public static final int WCONTINUED;

    field public static final int WEXITED;

    field public static final int WNOHANG;

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -38172,6 +38172,7 @@ package android.system { 
    method public static void seteuid(int) throws android.system.ErrnoException;

    method public static void setgid(int) throws android.system.ErrnoException;

    method public static int setsid() throws android.system.ErrnoException;

    method public static void setsockoptInt(java.io.FileDescriptor, int, int, int) throws android.system.ErrnoException;

    method public static void setuid(int) throws android.system.ErrnoException;

    method public static void shutdown(java.io.FileDescriptor, int) throws android.system.ErrnoException;

    method public static java.io.FileDescriptor socket(int, int, int) throws android.system.ErrnoException;
@@ -38582,6 +38583,7 @@ package android.system { 
    field public static final int S_IXOTH;

    field public static final int S_IXUSR;

    field public static final int TCP_NODELAY;

    field public static final int TCP_USER_TIMEOUT;

    field public static final int WCONTINUED;

    field public static final int WEXITED;

    field public static final int WNOHANG;