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

Commit 8c56fbd3 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)"... 

Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)" am: f1d119cc am: 97b24c2f
am: c150ad33

Change-Id: I215ffb68fa4b223f98b49593d4ab6b3b7590b845
parents efd96481 c150ad33

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -35467,6 +35467,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;
@@ -35877,6 +35878,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
@@ -38325,6 +38325,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;
@@ -38735,6 +38736,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;