commit c3c1ce159ac051ab7fab859a683c0a22c2da2f1c
author Neil Fuller <nfuller@google.com> Tue Nov 13 13:44:24 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 13 13:44:24 2018 +0000
tree 20dea28f456eae6c0cf298f3560f5368983f21bf
parent cd06c55223a864a211f89a645049e1f02b4d90d9
parent eba96eaa8fdee621a9a77a8a34cb35763eda14f2

Merge "Remove unnecessary classes from CorePlatformApi"

luni/src/main/java/libcore/icu/TimeZoneNames.java

diff --git a/luni/src/main/java/libcore/icu/TimeZoneNames.java b/luni/src/main/java/libcore/icu/TimeZoneNames.java
index 172e0b3..f28e96e 100644
--- a/luni/src/main/java/libcore/icu/TimeZoneNames.java
+++ b/luni/src/main/java/libcore/icu/TimeZoneNames.java
@@ -30,7 +30,6 @@
  * Provides access to ICU's time zone name data.
  * @hide
  */
-@libcore.api.CorePlatformApi
 public final class TimeZoneNames {
     private static final String[] availableTimeZoneIds = TimeZone.getAvailableIDs();
 
@@ -47,7 +46,6 @@
     private static final ZoneStringsCache cachedZoneStrings = new ZoneStringsCache();
 
     /** @hide */
-    @libcore.api.CorePlatformApi
     public static class ZoneStringsCache extends BasicLruCache<Locale, String[][]> {
         public ZoneStringsCache() {
             super(5); // Room for a handful of locales.

luni/src/main/java/libcore/util/BasicLruCache.java

diff --git a/luni/src/main/java/libcore/util/BasicLruCache.java b/luni/src/main/java/libcore/util/BasicLruCache.java
index 6ba0bf2..4f5b1b8 100644
--- a/luni/src/main/java/libcore/util/BasicLruCache.java
+++ b/luni/src/main/java/libcore/util/BasicLruCache.java
@@ -25,13 +25,11 @@
  * android.util.LruCache} where that is available.
  * @hide
  */
-@libcore.api.CorePlatformApi
 public class BasicLruCache<K, V> {
     @UnsupportedAppUsage
     private final LinkedHashMap<K, V> map;
     private final int maxSize;
 
-    @libcore.api.CorePlatformApi
     public BasicLruCache(int maxSize) {
         if (maxSize <= 0) {
             throw new IllegalArgumentException("maxSize <= 0");

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 626873e..7d6afea 100644
--- a/mmodules/core_platform_api/api/platform/current-api.txt
+++ b/mmodules/core_platform_api/api/platform/current-api.txt
@@ -1006,12 +1006,6 @@
     method public static java.lang.String getRelativeTimeSpanString(java.util.Locale, java.util.TimeZone, long, long, long, int);
   }
 
-  public final class TimeZoneNames {
-  }
-
-  public static class TimeZoneNames.ZoneStringsCache extends libcore.util.BasicLruCache {
-  }
-
 }
 
 package libcore.internal {
@@ -1152,10 +1146,6 @@
     method public static void throwsIfOutOfBounds(int, int, int);
   }
 
-  public class BasicLruCache<K, V> {
-    ctor public BasicLruCache(int);
-  }
-
   public final class CountryTimeZones {
     method public java.lang.String getCountryIso();
     method public java.lang.String getDefaultTimeZoneId();