diff options
author | Victor Chang <vichang@google.com> | 2021-09-20 10:55:13 +0100 |
---|---|---|
committer | Victor Chang <vichang@google.com> | 2021-09-20 10:55:13 +0100 |
commit | f59a9a074cbf5a08fa97a01d95d05edd62a61696 (patch) | |
tree | ee3b99633fe32aadfe42ae198bd9044a6fa42588 | |
parent | 6745f06499e50d7c53ae9f82a5f4e34d1ab40806 (diff) | |
download | icu-f59a9a074cbf5a08fa97a01d95d05edd62a61696.tar.gz |
Remove unused @CorePlatformApi(LEGACY) in ICU
ICU haven't stablized its @CorePlatformApi yet, and thus the unused API
can be removed.
Bug: 119751170
Test: m droid
Change-Id: I31c4f99bc505fe9623c7aaadf627b53e13c88e1c
4 files changed, 0 insertions, 28 deletions
diff --git a/android_icu4j/api/legacy_platform/current.txt b/android_icu4j/api/legacy_platform/current.txt index 692b2b1bf..17097b374 100644 --- a/android_icu4j/api/legacy_platform/current.txt +++ b/android_icu4j/api/legacy_platform/current.txt @@ -1,12 +1,4 @@ // Signature format: 2.0 -package android.icu.impl { - - public class TimeZoneAdapter extends java.util.TimeZone { - method public static java.util.TimeZone wrap(android.icu.util.TimeZone); - } - -} - package android.icu.text { public class DateFormatSymbols implements java.lang.Cloneable java.io.Serializable { @@ -32,14 +24,6 @@ package android.icu.util { method public abstract android.icu.util.TimeZoneTransition getNextTransition(long, boolean); } - public class Region implements java.lang.Comparable<android.icu.util.Region> { - method public static java.util.Set<android.icu.util.Region> getAvailable(android.icu.util.Region.RegionType); - } - - public enum Region.RegionType { - enum_constant public static final android.icu.util.Region.RegionType TERRITORY; - } - public abstract class TimeZoneRule implements java.io.Serializable { method public int getDSTSavings(); } diff --git a/android_icu4j/src/main/java/android/icu/impl/TimeZoneAdapter.java b/android_icu4j/src/main/java/android/icu/impl/TimeZoneAdapter.java index 37ae2b55c..e265ae6f4 100644 --- a/android_icu4j/src/main/java/android/icu/impl/TimeZoneAdapter.java +++ b/android_icu4j/src/main/java/android/icu/impl/TimeZoneAdapter.java @@ -30,7 +30,6 @@ import android.icu.util.TimeZone; * @author Alan Liu * @hide Only a subset of ICU is exposed in Android */ -@libcore.api.CorePlatformApi public class TimeZoneAdapter extends java.util.TimeZone { // Generated by serialver from JDK 1.4.1_01 @@ -46,7 +45,6 @@ public class TimeZoneAdapter extends java.util.TimeZone { * Given a java.util.TimeZone, wrap it in the appropriate adapter * subclass of android.icu.util.TimeZone and return the adapter. */ - @libcore.api.CorePlatformApi public static java.util.TimeZone wrap(android.icu.util.TimeZone tz) { return new TimeZoneAdapter(tz); } diff --git a/android_icu4j/src/main/java/android/icu/util/Region.java b/android_icu4j/src/main/java/android/icu/util/Region.java index 44a41e6e8..767fcc015 100644 --- a/android_icu4j/src/main/java/android/icu/util/Region.java +++ b/android_icu4j/src/main/java/android/icu/util/Region.java @@ -60,7 +60,6 @@ import android.icu.impl.ICUResourceBundle; * @hide Only a subset of ICU is exposed in Android */ -@libcore.api.CorePlatformApi public class Region implements Comparable<Region> { /** @@ -70,7 +69,6 @@ public class Region implements Comparable<Region> { * @hide Only a subset of ICU is exposed in Android */ - @libcore.api.CorePlatformApi public enum RegionType { /** * Type representing the unknown region. @@ -80,7 +78,6 @@ public class Region implements Comparable<Region> { /** * Type representing a territory. */ - @libcore.api.CorePlatformApi TERRITORY, /** @@ -435,7 +432,6 @@ public class Region implements Comparable<Region> { * @return An unmodifiable set of all known regions that match the given type. */ - @libcore.api.CorePlatformApi public static Set<Region> getAvailable(RegionType type) { loadRegionData(); diff --git a/tools/srcgen/core-platform-api.txt b/tools/srcgen/core-platform-api.txt index 0ff685a34..5c9c314af 100644 --- a/tools/srcgen/core-platform-api.txt +++ b/tools/srcgen/core-platform-api.txt @@ -1,21 +1,15 @@ field:android.icu.text.StringPrep#DEFAULT field:android.icu.text.StringPrep#RFC3920_RESOURCEPREP -enumConstant:android.icu.util.Region$RegionType#TERRITORY -method:android.icu.impl.TimeZoneAdapter#wrap(android.icu.util.TimeZone) method:android.icu.text.DateFormatSymbols#getAmpmNarrowStrings() method:android.icu.text.DateTimePatternGenerator#getBestPattern(String,int,boolean) method:android.icu.text.StringPrep#getInstance(int) method:android.icu.text.StringPrep#prepare(String,int) method:android.icu.util.BasicTimeZone#getNextTransition(long,boolean) -method:android.icu.util.Region#getAvailable(RegionType) method:android.icu.util.TimeZoneRule#getDSTSavings() method:android.icu.util.TimeZoneTransition#getFrom() method:android.icu.util.TimeZoneTransition#getTime() method:android.icu.util.TimeZoneTransition#getTo() -type:android.icu.impl.TimeZoneAdapter type:android.icu.text.StringPrep type:android.icu.util.BasicTimeZone -type:android.icu.util.Region -type:android.icu.util.Region$RegionType type:android.icu.util.TimeZoneRule type:android.icu.util.TimeZoneTransition |