Import Android SDK Platform P [4477446]

/google/data/ro/projects/android/fetch_artifact \
    --bid 4477446 \
    --target sdk_phone_armv7-win_sdk \
    sdk-repo-linux-sources-4477446.zip

AndroidVersion.ApiLevel has been modified to appear as 28

Change-Id: If0559643d7c328e36aafca98f0c114641d33642c

1 files changed, 0 insertions, 43 deletions

diff --git a/android/system/Os.java b/android/system/Os.java
index fe8f7d45..cc24cc5e 100644
--- a/android/system/Os.java
+++ b/android/system/Os.java
@@ -16,8 +16,6 @@
 
 package android.system;
 
-import android.util.MutableInt;
-import android.util.MutableLong;
 import java.io.FileDescriptor;
 import java.io.InterruptedIOException;
 import java.net.InetAddress;
@@ -473,27 +471,6 @@ public final class Os {
 
     /**
      * See <a href="http://man7.org/linux/man-pages/man2/sendfile.2.html">sendfile(2)</a>.
-     *
-     * @deprecated This method will be removed in a future version of Android. Use
-     *        {@link #sendfile(FileDescriptor, FileDescriptor, Int64Ref, long)} instead.
-     */
-    @Deprecated
-    public static long sendfile(FileDescriptor outFd, FileDescriptor inFd, MutableLong inOffset, long byteCount) throws ErrnoException {
-        if (inOffset == null) {
-            return Libcore.os.sendfile(outFd, inFd, null, byteCount);
-        } else {
-            libcore.util.MutableLong internalInOffset = new libcore.util.MutableLong(
-                    inOffset.value);
-            try {
-                return Libcore.os.sendfile(outFd, inFd, internalInOffset, byteCount);
-            } finally {
-                inOffset.value = internalInOffset.value;
-            }
-        }
-    }
-
-    /**
-     * See <a href="http://man7.org/linux/man-pages/man2/sendfile.2.html">sendfile(2)</a>.
      */
     public static long sendfile(FileDescriptor outFd, FileDescriptor inFd, Int64Ref inOffset, long byteCount) throws ErrnoException {
         if (inOffset == null) {
@@ -672,26 +649,6 @@ public final class Os {
     /**
      * See <a href="http://man7.org/linux/man-pages/man2/waitpid.2.html">waitpid(2)</a>.
      *
-     * @deprecated This method will be removed in a future version of Android. Use
-     *        {@link #waitpid(int, Int32Ref, int)} instead.
-     */
-    @Deprecated
-    public static int waitpid(int pid, MutableInt status, int options) throws ErrnoException {
-        if (status == null) {
-            return Libcore.os.waitpid(pid, null, options);
-        } else {
-            libcore.util.MutableInt internalStatus = new libcore.util.MutableInt(status.value);
-            try {
-                return Libcore.os.waitpid(pid, internalStatus, options);
-            } finally {
-                status.value = internalStatus.value;
-            }
-        }
-    }
-
-    /**
-     * See <a href="http://man7.org/linux/man-pages/man2/waitpid.2.html">waitpid(2)</a>.
-     *
      * @throws IllegalArgumentException if {@code status != null && status.length != 1}
      */
     public static int waitpid(int pid, Int32Ref status, int options) throws ErrnoException {