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

am: f1d119ccd3

Change-Id: I90e74c457475f16edd20369bb8c024896c9e241c
This commit is contained in:
Tobias Thierer
2016-08-04 11:00:03 +00:00
committed by android-build-merger
2 changed files with 4 additions and 0 deletions

View File

@@ -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;

View File

@@ -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;