Merge "Add AsynchronousCloseMonitor to intra-core API."
diff --git a/luni/src/main/java/libcore/io/AsynchronousCloseMonitor.java b/luni/src/main/java/libcore/io/AsynchronousCloseMonitor.java
index adb193d..49d71a0 100644
--- a/luni/src/main/java/libcore/io/AsynchronousCloseMonitor.java
+++ b/luni/src/main/java/libcore/io/AsynchronousCloseMonitor.java
@@ -18,11 +18,19 @@
import android.compat.annotation.UnsupportedAppUsage;
import java.io.FileDescriptor;
+import libcore.api.IntraCoreApi;
+/**
+ * Implements interruption of threads blocked in I/O system calls.
+ *
+ * @hide
+ */
+@IntraCoreApi
public final class AsynchronousCloseMonitor {
private AsynchronousCloseMonitor() {
}
@UnsupportedAppUsage
+ @IntraCoreApi
public static native void signalBlockedThreads(FileDescriptor fd);
}
diff --git a/mmodules/intracoreapi/api/intra/current-api.txt b/mmodules/intracoreapi/api/intra/current-api.txt
index df28b02..fc27923 100644
--- a/mmodules/intracoreapi/api/intra/current-api.txt
+++ b/mmodules/intracoreapi/api/intra/current-api.txt
@@ -111,6 +111,14 @@
}
+package libcore.io {
+
+ @libcore.api.IntraCoreApi public final class AsynchronousCloseMonitor {
+ method @libcore.api.IntraCoreApi public static void signalBlockedThreads(java.io.FileDescriptor);
+ }
+
+}
+
package libcore.net {
@libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public abstract class NetworkSecurityPolicy {
diff --git a/mmodules/intracoreapi/api/intra/last-api.txt b/mmodules/intracoreapi/api/intra/last-api.txt
index af707b3..a62bfb6 100644
--- a/mmodules/intracoreapi/api/intra/last-api.txt
+++ b/mmodules/intracoreapi/api/intra/last-api.txt
@@ -53,6 +53,14 @@
}
+package libcore.io {
+
+ @libcore.api.IntraCoreApi public final class AsynchronousCloseMonitor {
+ method @libcore.api.IntraCoreApi public static void signalBlockedThreads(java.io.FileDescriptor);
+ }
+
+}
+
package libcore.net {
@libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public abstract class NetworkSecurityPolicy {
diff --git a/non_openjdk_java_files.bp b/non_openjdk_java_files.bp
index 7b39f09..8fc3607 100644
--- a/non_openjdk_java_files.bp
+++ b/non_openjdk_java_files.bp
@@ -239,6 +239,7 @@
"luni/src/main/java/libcore/icu/RelativeDateTimeFormatter.java",
"luni/src/main/java/libcore/icu/TimeZoneNames.java",
"luni/src/main/java/libcore/internal/StringPool.java",
+ "luni/src/main/java/libcore/io/AsynchronousCloseMonitor.java",
"luni/src/main/java/libcore/io/ForwardingOs.java",
"luni/src/main/java/libcore/io/IoBridge.java",
"luni/src/main/java/libcore/io/IoUtils.java",
@@ -377,7 +378,6 @@
"luni/src/main/java/libcore/icu/DateTimeFormat.java",
"luni/src/main/java/libcore/icu/DateUtilsBridge.java",
"luni/src/main/java/libcore/internal/Java9LanguageFeatures.java",
- "luni/src/main/java/libcore/io/AsynchronousCloseMonitor.java",
"luni/src/main/java/libcore/io/ClassPathURLStreamHandler.java",
"luni/src/main/java/libcore/io/BlockGuardOs.java",
"luni/src/main/java/libcore/io/BufferIterator.java",