diff options
| author | vichang <vichang@google.com> | 2020-07-22 09:15:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-22 09:15:50 +0000 |
| commit | 43338b0c6f07bb6fc0ab828a34658c4d7363a805 (patch) | |
| tree | 8973306251d2908757b3414c8291adcd4442dc4e | |
| parent | b5ada805d0843aa1d5c30e6466c50efbd2455449 (diff) | |
| parent | 2b7cb0c44b28d29a969f0d69ef0d88c9d135a8e0 (diff) | |
| download | icu-43338b0c6f07bb6fc0ab828a34658c4d7363a805.tar.gz | |
Merge "Update @IntraCoreApi and @CorePlatformApi in the ICU4J srcgen tool" am: 2b7cb0c44b
Original change: https://android-review.googlesource.com/c/platform/external/icu/+/1367398
Change-Id: I9b67f8d96f241f6185a62a3a84e9380c9d903e3f
| -rw-r--r-- | tools/srcgen/core-platform-api.txt | 1 | ||||
| -rw-r--r-- | tools/srcgen/intra-core-api.txt | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/tools/srcgen/core-platform-api.txt b/tools/srcgen/core-platform-api.txt index 53ec06c79..f133e88d1 100644 --- a/tools/srcgen/core-platform-api.txt +++ b/tools/srcgen/core-platform-api.txt @@ -5,6 +5,7 @@ method:android.icu.impl.CalendarAstronomer#CalendarAstronomer(double,double) method:android.icu.impl.CalendarAstronomer#getSunRiseSet(boolean) method:android.icu.impl.CalendarAstronomer#setTime(long) method:android.icu.impl.TimeZoneAdapter#wrap(android.icu.util.TimeZone) +method:android.icu.text.DateFormatSymbols#getAmpmNarrowStrings() method:android.icu.text.StringPrep#getInstance(int) method:android.icu.text.StringPrep#prepare(String,int) method:android.icu.util.BasicTimeZone#getNextTransition(long,boolean) diff --git a/tools/srcgen/intra-core-api.txt b/tools/srcgen/intra-core-api.txt index 6f8ef987c..9abb84c01 100644 --- a/tools/srcgen/intra-core-api.txt +++ b/tools/srcgen/intra-core-api.txt @@ -19,7 +19,6 @@ field:android.icu.util.UResourceBundle#ARRAY method:android.icu.impl.CacheValue#setStrength(Strength) method:android.icu.impl.ICUResourceBundle#getStringWithFallback(String) method:android.icu.impl.ICUResourceBundle#getWithFallback(String) -method:android.icu.impl.JavaTimeZone#JavaTimeZone(java.util.TimeZone,String) method:android.icu.impl.ZoneMeta#getCanonicalCLDRID(String) method:android.icu.text.CurrencyMetaInfo#getInstance() method:android.icu.text.CurrencyMetaInfo#currencies(CurrencyFilter) @@ -27,7 +26,6 @@ method:android.icu.text.CurrencyMetaInfo$CurrencyFilter#onRegion(String) method:android.icu.text.CurrencyMetaInfo$CurrencyFilter#withDate(Date) method:android.icu.text.DateFormatSymbols#DateFormatSymbols(ULocale,String) method:android.icu.text.DateFormatSymbols#getNarrowEras() -method:android.icu.text.DateFormatSymbols#getAmpmNarrowStrings() method:android.icu.text.DateTimePatternGenerator#getFrozenInstance(ULocale) method:android.icu.text.DecimalFormat#setParseStrictMode(ParseMode) method:android.icu.text.IDNA#convertIDNToASCII(String,int) @@ -73,7 +71,6 @@ type:android.icu.impl.CacheValue type:android.icu.impl.CacheValue$Strength type:android.icu.impl.ICUData type:android.icu.impl.ICUResourceBundle -type:android.icu.impl.JavaTimeZone type:android.icu.impl.number.DecimalFormatProperties type:android.icu.impl.number.DecimalFormatProperties$ParseMode type:android.icu.impl.ZoneMeta |