diff options
| author | 2019-04-01 09:59:59 -0700 | |
|---|---|---|
| committer | 2019-04-01 09:59:59 -0700 | |
| commit | f06759e7999169670b10cc32f0ae21097c28c5bb (patch) | |
| tree | abf6dbd1ea1473315a75b8f29e57147a4e2b5760 | |
| parent | e93de65e84403f827959578a645582c493b420da (diff) | |
| parent | 0036c6476460ca8c47f4180e18f0fa60724494f2 (diff) | |
Merge "Track public android.system API changes in libcore" am: 1423684d1a
am: 0036c64764
Change-Id: I93b2d6742193414b3f6a81cd35e923a4f6b7f2fb
| -rwxr-xr-x | api/current.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 5d2eee4a6bdd..87292dd239c8 100755 --- a/api/current.txt +++ b/api/current.txt @@ -40463,6 +40463,7 @@ package android.system { method public static int getpid(); method public static int getppid(); method public static java.net.SocketAddress getsockname(java.io.FileDescriptor) throws android.system.ErrnoException; + method @NonNull public static android.system.StructTimeval getsockoptTimeval(@NonNull java.io.FileDescriptor, int, int) throws android.system.ErrnoException; method public static int gettid(); method public static int getuid(); method public static byte[] getxattr(String, String) throws android.system.ErrnoException; @@ -40513,6 +40514,7 @@ package android.system { method @Deprecated 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 setsockoptTimeval(@NonNull java.io.FileDescriptor, int, int, @NonNull android.system.StructTimeval) throws android.system.ErrnoException; method @Deprecated public static void setuid(int) throws android.system.ErrnoException; method public static void setxattr(String, String, byte[], int) throws android.system.ErrnoException; method public static void shutdown(java.io.FileDescriptor, int) throws android.system.ErrnoException; @@ -41094,6 +41096,13 @@ package android.system { field public final long tv_sec; } + public final class StructTimeval { + method @NonNull public static android.system.StructTimeval fromMillis(long); + method public long toMillis(); + field public final long tv_sec; + field public final long tv_usec; + } + public final class StructUtsname { ctor public StructUtsname(String, String, String, String, String); field public final String machine; |