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 am: 97b24c2f6a

Browse Source 
am: c150ad3357

Change-Id: I215ffb68fa4b223f98b49593d4ab6b3b7590b845
This commit is contained in:
Tobias Thierer
2016-08-04 11:15:13 +00:00
committed by android-build-merger
parent efd96481c3 c150ad3357
commit 8c56fbd38d
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

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

2
api/system-current.txt
View File

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