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

Commit f1d119cc authored by Tobias Thierer's avatar Tobias Thierer Committed by Gerrit Code Review
Browse files

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

parents f28f6bb2 4122b913

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -33406,6 +33406,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;
@@ -33816,6 +33817,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
@@ -35558,6 +35558,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;
@@ -35968,6 +35969,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;