Add some additional entries in the intra core api
These are needed to allow the core-all (and indirectly core-tests) to
build against the i18n intra core api stubs.
Bug: 141683101
Test: m checkbuild
Change-Id: Icfedf8ae51f294046fcdcdd91600bbb971ac087e
diff --git a/android_icu4j/api/intra/current-api.txt b/android_icu4j/api/intra/current-api.txt
index ee51707..1d0dd77 100644
--- a/android_icu4j/api/intra/current-api.txt
+++ b/android_icu4j/api/intra/current-api.txt
@@ -96,6 +96,7 @@
public abstract class BasicTimeZone extends android.icu.util.TimeZone {
method public abstract android.icu.util.TimeZoneTransition getNextTransition(long, boolean);
+ method public abstract android.icu.util.TimeZoneTransition getPreviousTransition(long, boolean);
method public abstract android.icu.util.TimeZoneRule[] getTimeZoneRules();
}
@@ -122,6 +123,36 @@
public class InitialTimeZoneRule extends android.icu.util.TimeZoneRule {
}
+ public final class LocaleData {
+ method public static android.icu.util.VersionInfo getCLDRVersion();
+ method public String getDelimiter(int);
+ method public static android.icu.text.UnicodeSet getExemplarSet(android.icu.util.ULocale, int, int);
+ method public android.icu.text.UnicodeSet getExemplarSet(int, int);
+ method public static android.icu.util.LocaleData getInstance(android.icu.util.ULocale);
+ method public static android.icu.util.LocaleData getInstance();
+ method public static android.icu.util.LocaleData.MeasurementSystem getMeasurementSystem(android.icu.util.ULocale);
+ method public boolean getNoSubstitute();
+ method public static android.icu.util.LocaleData.PaperSize getPaperSize(android.icu.util.ULocale);
+ method public void setNoSubstitute(boolean);
+ field public static final int ALT_QUOTATION_END = 3; // 0x3
+ field public static final int ALT_QUOTATION_START = 2; // 0x2
+ field public static final int ES_INDEX = 2; // 0x2
+ field public static final int ES_STANDARD = 0; // 0x0
+ field public static final int QUOTATION_END = 1; // 0x1
+ field public static final int QUOTATION_START = 0; // 0x0
+ }
+
+ public static final class LocaleData.MeasurementSystem {
+ field public static final android.icu.util.LocaleData.MeasurementSystem SI;
+ field public static final android.icu.util.LocaleData.MeasurementSystem UK;
+ field public static final android.icu.util.LocaleData.MeasurementSystem US;
+ }
+
+ public static final class LocaleData.PaperSize {
+ method public int getHeight();
+ method public int getWidth();
+ }
+
public abstract class TimeZone implements java.lang.Cloneable android.icu.util.Freezable<android.icu.util.TimeZone> java.io.Serializable {
method @Deprecated public static void setICUDefault(android.icu.util.TimeZone);
}
@@ -144,6 +175,7 @@
public abstract class UResourceBundle extends java.util.ResourceBundle {
ctor public UResourceBundle();
method public static android.icu.util.UResourceBundle getBundleInstance(String, java.util.Locale);
+ method public static android.icu.util.UResourceBundle getBundleInstance(String, android.icu.util.ULocale);
method public String[] getStringArray();
}
diff --git a/android_icu4j/src/main/java/android/icu/util/BasicTimeZone.java b/android_icu4j/src/main/java/android/icu/util/BasicTimeZone.java
index 31e04ee..c8adf08 100644
--- a/android_icu4j/src/main/java/android/icu/util/BasicTimeZone.java
+++ b/android_icu4j/src/main/java/android/icu/util/BasicTimeZone.java
@@ -62,6 +62,7 @@
* before the given base time, or null if no time zone transitions
* are available before the base time.
*/
+ @libcore.api.IntraCoreApi
public abstract TimeZoneTransition getPreviousTransition(long base, boolean inclusive);
/**
diff --git a/android_icu4j/src/main/java/android/icu/util/LocaleData.java b/android_icu4j/src/main/java/android/icu/util/LocaleData.java
index 221e936..66a7450 100644
--- a/android_icu4j/src/main/java/android/icu/util/LocaleData.java
+++ b/android_icu4j/src/main/java/android/icu/util/LocaleData.java
@@ -20,6 +20,7 @@
* A class for accessing miscellaneous data in the locale bundles
* @author ram
*/
+@libcore.api.IntraCoreApi
public final class LocaleData {
// private static final String EXEMPLAR_CHARS = "ExemplarCharacters";
@@ -39,6 +40,7 @@
* http://www.unicode.org/reports/tr35/tr35-general.html#Character_Elements</a>.
* @hide unsupported on Android
*/
+ @libcore.api.IntraCoreApi
public static final int ES_STANDARD = 0;
/**
@@ -57,6 +59,7 @@
* http://www.unicode.org/reports/tr35/tr35-general.html#Character_Elements</a>.
* @hide unsupported on Android
*/
+ @libcore.api.IntraCoreApi
public static final int ES_INDEX = 2;
/**
@@ -160,6 +163,7 @@
* @return The set of exemplar characters for the given locale.
* @hide unsupported on Android
*/
+ @libcore.api.IntraCoreApi
public static UnicodeSet getExemplarSet(ULocale locale, int options, int extype) {
return LocaleData.getInstance(locale).getExemplarSet(options, extype);
}
@@ -184,6 +188,7 @@
* @exception RuntimeException if the extype is invalid.
* @hide unsupported on Android
*/
+ @libcore.api.IntraCoreApi
public UnicodeSet getExemplarSet(int options, int extype) {
String [] exemplarSetTypes = {
"ExemplarCharacters",
diff --git a/android_icu4j/src/main/java/android/icu/util/UResourceBundle.java b/android_icu4j/src/main/java/android/icu/util/UResourceBundle.java
index 46ec3eb..a9d56a8 100644
--- a/android_icu4j/src/main/java/android/icu/util/UResourceBundle.java
+++ b/android_icu4j/src/main/java/android/icu/util/UResourceBundle.java
@@ -219,6 +219,7 @@
* @return a resource bundle for the given base name and locale
*/
@dalvik.annotation.compat.UnsupportedAppUsage
+ @libcore.api.IntraCoreApi
public static UResourceBundle getBundleInstance(String baseName, ULocale locale) {
if (baseName == null) {
baseName = ICUData.ICU_BASE_NAME;
diff --git a/tools/srcgen/intra-core-api.txt b/tools/srcgen/intra-core-api.txt
index 7ca6d1c..799b257 100644
--- a/tools/srcgen/intra-core-api.txt
+++ b/tools/srcgen/intra-core-api.txt
@@ -75,3 +75,12 @@
type:android.icu.util.TimeZoneRule
type:android.icu.util.TimeZoneTransition
type:android.icu.util.UResourceBundle
+
+# For testing purposes
+field:android.icu.util.LocaleData#ES_INDEX
+field:android.icu.util.LocaleData#ES_STANDARD
+method:android.icu.util.BasicTimeZone#getPreviousTransition(long,boolean)
+method:android.icu.util.LocaleData#getExemplarSet(int,int)
+method:android.icu.util.LocaleData#getExemplarSet(ULocale,int,int)
+method:android.icu.util.UResourceBundle#getBundleInstance(String,ULocale)
+type:android.icu.util.LocaleData