commit da37c230d0b276bb93e298517d578449e7c896bc
author Tobias Thierer <tobiast@google.com> Thu Aug 04 11:23:17 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 04 11:23:17 2016 +0000
tree 97602c1232814424c30baf6f7175f32bac228ad6
parent 632bd4909e18ee07dc06fd23fe9992e77c24806e
parent 8c56fbd38d6ea66703e4a7bde99ecfa13db7910f

Merge "Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, value)" am: f1d119ccd3 am: 97b24c2f6a am: c150ad3357
am: 8c56fbd38d

Change-Id: Ia94dc2ae051b6053b4ac438a4894e0c18b30bfb6

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 69a3000..9145b31 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -35537,6 +35537,7 @@
     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;
@@ -35947,6 +35948,7 @@
     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

diff --git a/api/system-current.txt b/api/system-current.txt
index d5eb5fa..3d26654 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -38387,6 +38387,7 @@
     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;
@@ -38797,6 +38798,7 @@
     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;