From 4122b913f33fd5fc6127a30664d5edcf2ef24ab6 Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Wed, 3 Aug 2016 17:19:27 +0100
Subject: [PATCH] Add API for setsockoptInt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT,
 value)

Test: "make" succeeds.

Bug: 30402085
Change-Id: I4bc4b5dcfab04ac756578c2fae7a337e74587b66
---
 api/current.txt        | 2 ++
 api/system-current.txt | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index 28498fffb965c..554afa3592546 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -33406,6 +33406,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;
@@ -33816,6 +33817,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;
diff --git a/api/system-current.txt b/api/system-current.txt
index 6092433e7b340..722d682095dfa 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -35558,6 +35558,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;
@@ -35968,6 +35969,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;