diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2015-03-16 13:37:20 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-16 13:37:20 +0000 |
commit | 2e669f1cdb16a6797e20fd46fbb8409f1e868d4d (patch) | |
tree | e1e993cc604ff43b3985eec969855ae25b8b368e | |
parent | 2b4ae2748dda20a34ccb8143f66c19d4162551bf (diff) | |
parent | 6ff8e03ef67c204565ceb3679029a0b88bdfaa62 (diff) | |
download | libcore-2e669f1cdb16a6797e20fd46fbb8409f1e868d4d.zip libcore-2e669f1cdb16a6797e20fd46fbb8409f1e868d4d.tar.gz libcore-2e669f1cdb16a6797e20fd46fbb8409f1e868d4d.tar.bz2 |
am 6ff8e03e: am ba6caa1c: Merge "Expose the SocketAddress variant to bundled apps."
* commit '6ff8e03ef67c204565ceb3679029a0b88bdfaa62':
Expose the SocketAddress variant to bundled apps.
-rw-r--r-- | luni/src/main/java/android/system/Os.java | 5 |
1 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 ee683d2..fcecf18 100644 --- a/luni/src/main/java/android/system/Os.java +++ b/luni/src/main/java/android/system/Os.java @@ -410,6 +410,11 @@ public final class Os { public static int sendto(FileDescriptor fd, byte[] bytes, int byteOffset, int byteCount, int flags, InetAddress inetAddress, int port) throws ErrnoException, SocketException { return Libcore.os.sendto(fd, bytes, byteOffset, byteCount, flags, inetAddress, port); } /** + * See <a href="http://man7.org/linux/man-pages/man2/sendto.2.html">sendto(2)</a>. + */ + /** @hide */ public static int sendto(FileDescriptor fd, byte[] bytes, int byteOffset, int byteCount, int flags, SocketAddress address) throws ErrnoException, SocketException { return Libcore.os.sendto(fd, bytes, byteOffset, byteCount, flags, address); } + + /** * See <a href="http://man7.org/linux/man-pages/man2/setegid.2.html">setegid(2)</a>. */ public static void setegid(int egid) throws ErrnoException { Libcore.os.setegid(egid); } |