commit 11a3c32db5b617f435ca82c7d4f135058d1546b6
author Remi NGUYEN VAN <reminv@google.com> Wed Feb 06 03:08:07 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Feb 06 03:08:07 2019 -0800
tree e8b1b9061f5167365969160ce056d16a09de8028
parent 2b9c1409ee5894361f57b34420d8ba170b335804
parent 83d51df23b460470320fa7187e1dcb85110de751

Merge "Mark Os.bind, Os.sendTo as public API"
am: 83d51df23b

Change-Id: I46910213e7630367c38979a8ac4624d20218285a

luni/src/main/java/android/system/Os.java

diff --git a/luni/src/main/java/android/system/Os.java b/luni/src/main/java/android/system/Os.java
index 14bb61a..8451884 100644
--- a/luni/src/main/java/android/system/Os.java
+++ b/luni/src/main/java/android/system/Os.java
@@ -54,9 +54,9 @@
      */
     public static void bind(FileDescriptor fd, InetAddress address, int port) throws ErrnoException, SocketException { Libcore.os.bind(fd, address, port); }
 
-    /** @hide */
-    @UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
+    /**
+     * See <a href="http://man7.org/linux/man-pages/man2/bind.2.html">bind(2)</a>.
+     */
     public static void bind(FileDescriptor fd, SocketAddress address) throws ErrnoException, SocketException { Libcore.os.bind(fd, address); }
 
     /**
@@ -511,10 +511,7 @@
 
     /**
      * See <a href="http://man7.org/linux/man-pages/man2/sendto.2.html">sendto(2)</a>.
-     * @hide
      */
-    @UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     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); }
 
     /**

mmodules/core_platform_api/api/platform/current-api.txt

diff --git a/mmodules/core_platform_api/api/platform/current-api.txt b/mmodules/core_platform_api/api/platform/current-api.txt
index b8c8135..10d7819 100644
--- a/mmodules/core_platform_api/api/platform/current-api.txt
+++ b/mmodules/core_platform_api/api/platform/current-api.txt
@@ -88,7 +88,6 @@
   }
 
   public final class Os {
-    method @dalvik.annotation.compat.UnsupportedAppUsage public static void bind(java.io.FileDescriptor, java.net.SocketAddress) throws android.system.ErrnoException, java.net.SocketException;
     method public static android.system.StructCapUserData[] capget(android.system.StructCapUserHeader) throws android.system.ErrnoException;
     method public static void capset(android.system.StructCapUserHeader, android.system.StructCapUserData[]) throws android.system.ErrnoException;
     method @dalvik.annotation.compat.UnsupportedAppUsage public static void connect(java.io.FileDescriptor, java.net.SocketAddress) throws android.system.ErrnoException, java.net.SocketException;
@@ -101,7 +100,6 @@
     method public static int ioctlInt(java.io.FileDescriptor, int, android.system.Int32Ref) throws android.system.ErrnoException;
     method public static java.io.FileDescriptor[] pipe2(int) throws android.system.ErrnoException;
     method public static String realpath(String) throws android.system.ErrnoException;
-    method @dalvik.annotation.compat.UnsupportedAppUsage public static int sendto(java.io.FileDescriptor, byte[], int, int, int, java.net.SocketAddress) throws android.system.ErrnoException, java.net.SocketException;
     method public static void setpgid(int, int) throws android.system.ErrnoException;
     method public static void setregid(int, int) throws android.system.ErrnoException;
     method public static void setreuid(int, int) throws android.system.ErrnoException;