diff options
| author | Adam Vartanian <flooey@google.com> | 2018-10-19 01:59:13 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-19 01:59:13 -0700 |
| commit | d1ef0cee4be36fd100bf2a839fa412c75f9eb81f (patch) | |
| tree | ca8a65764904475bcab24fa637238cf2db893faa | |
| parent | 31b1ba6ecec8d28ff7010838717d183765931969 (diff) | |
| parent | e93382685b661abb865b161aeb986ce3c9233ee9 (diff) | |
Merge "Add android.system.Os.setsockoptTimeval to intra-core API"
am: e93382685b
Change-Id: I6f63fe437bf19d4d739460f95e50df1cd74bf6cb
| -rw-r--r-- | luni/src/main/java/android/system/Os.java | 1 | ||||
| -rw-r--r-- | mmodules/intracoreapi/api/intra/current-api.txt | 4 |
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(); |