summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--luni/src/main/java/android/system/Os.java1
-rw-r--r--mmodules/intracoreapi/api/intra/current-api.txt4
2 files changed, 5 insertions, 0 deletions
diff --git a/luni/src/main/java/android/system/Os.java b/luni/src/main/java/android/system/Os.java
index 85531609fb..a4c7524a5b 100644
--- a/luni/src/main/java/android/system/Os.java
+++ b/luni/src/main/java/android/system/Os.java
@@ -589,6 +589,7 @@ public final class Os {
/** @hide */
@libcore.api.CorePlatformApi
+ @libcore.api.IntraCoreApi
public static void setsockoptTimeval(FileDescriptor fd, int level, int option, StructTimeval value) throws ErrnoException { Libcore.os.setsockoptTimeval(fd, level, option, value); }
/**
diff --git a/mmodules/intracoreapi/api/intra/current-api.txt b/mmodules/intracoreapi/api/intra/current-api.txt
index b2ee8dbcbf..80c924d93d 100644
--- a/mmodules/intracoreapi/api/intra/current-api.txt
+++ b/mmodules/intracoreapi/api/intra/current-api.txt
@@ -4,6 +4,10 @@ package android.system {
method public java.net.SocketException rethrowAsSocketException() throws java.net.SocketException;
}
+ public final class Os {
+ method public static void setsockoptTimeval(java.io.FileDescriptor, int, int, android.system.StructTimeval) throws android.system.ErrnoException;
+ }
+
public final class StructTimeval {
method public static android.system.StructTimeval fromMillis(long);
method public long toMillis();