Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 97b24c2f6a

Change-Id: I33dad5406389705ca2daa9baa75c1c7b42df046e
This commit is contained in:
Tobias Thierer
2016-08-04 11:06:54 +00:00
committed by android-build-merger
parent ec62c0780f 97b24c2f6a
commit c150ad3357
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -35356,6 +35356,7 @@ package android.system {
method public static void seteuid(int) throws android.system.ErrnoException; method public static void seteuid(int) throws android.system.ErrnoException;
method public static void setgid(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 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 setuid(int) throws android.system.ErrnoException;
method public static void shutdown(java.io.FileDescriptor, 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; 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_IXOTH;
field public static final int S_IXUSR; field public static final int S_IXUSR;
field public static final int TCP_NODELAY; 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 WCONTINUED;
field public static final int WEXITED; field public static final int WEXITED;
field public static final int WNOHANG; field public static final int WNOHANG;

2
api/system-current.txt
View File

@@ -38173,6 +38173,7 @@ package android.system {
method public static void seteuid(int) throws android.system.ErrnoException; method public static void seteuid(int) throws android.system.ErrnoException;
method public static void setgid(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 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 setuid(int) throws android.system.ErrnoException;
method public static void shutdown(java.io.FileDescriptor, 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; method public static java.io.FileDescriptor socket(int, int, int) throws android.system.ErrnoException;
@@ -38583,6 +38584,7 @@ package android.system {
field public static final int S_IXOTH; field public static final int S_IXOTH;
field public static final int S_IXUSR; field public static final int S_IXUSR;
field public static final int TCP_NODELAY; 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 WCONTINUED;
field public static final int WEXITED; field public static final int WEXITED;
field public static final int WNOHANG; field public static final int WNOHANG;