commit 2df2ca9a34b8fb064ea7493093d337171456bb1b
author Adam Vartanian <flooey@google.com> Wed Feb 20 08:44:30 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 20 08:44:30 2019 +0000
tree 10adfb4950f153774195475f3623b1ba1c2a4fba
parent c806cd560aceb41745d13dfc5e00d88270f7312c
parent f030e4ea0bcebbe295667073cac7ebe1a841f6d3

Merge "Remove IoUtils from intra-core API"

luni/src/main/java/libcore/io/IoUtils.java

diff --git a/luni/src/main/java/libcore/io/IoUtils.java b/luni/src/main/java/libcore/io/IoUtils.java
index 14a73e8..564393b 100644
--- a/luni/src/main/java/libcore/io/IoUtils.java
+++ b/luni/src/main/java/libcore/io/IoUtils.java
@@ -34,7 +34,6 @@
 
 /** @hide */
 @libcore.api.CorePlatformApi
-@libcore.api.IntraCoreApi
 public final class IoUtils {
     private IoUtils() {
     }
@@ -160,7 +159,6 @@
      */
     @UnsupportedAppUsage
     @libcore.api.CorePlatformApi
-    @libcore.api.IntraCoreApi
     public static void closeQuietly(AutoCloseable closeable) {
         if (closeable != null) {
             try {

mmodules/intracoreapi/api/intra/current-api.txt

diff --git a/mmodules/intracoreapi/api/intra/current-api.txt b/mmodules/intracoreapi/api/intra/current-api.txt
index 34e6313..26f466d 100644
--- a/mmodules/intracoreapi/api/intra/current-api.txt
+++ b/mmodules/intracoreapi/api/intra/current-api.txt
@@ -496,10 +496,6 @@
 
 package libcore.io {
 
-  @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public final class IoUtils {
-    method @dalvik.annotation.compat.UnsupportedAppUsage @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public static void closeQuietly(AutoCloseable);
-  }
-
   @libcore.api.IntraCoreApi public final class Libcore {
     field @dalvik.annotation.compat.UnsupportedAppUsage @libcore.api.IntraCoreApi public static volatile libcore.io.Os os;
   }