Merge "Track external/icu API changes for factory registration" into nyc-dev... (e935ca55) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −42

Original line number	Diff line number	Diff line
		@@ -16284,11 +16284,8 @@ package android.icu.text {
		method public abstract int next();
		method public int preceding(int);
		method public abstract int previous();
		method public static java.lang.Object registerInstance(android.icu.text.BreakIterator, java.util.Locale, int);
		method public static java.lang.Object registerInstance(android.icu.text.BreakIterator, android.icu.util.ULocale, int);
		method public void setText(java.lang.String);
		method public abstract void setText(java.text.CharacterIterator);
		method public static boolean unregister(java.lang.Object);
		field public static final int DONE = -1; // 0xffffffff
		field public static final int KIND_CHARACTER = 0; // 0x0
		field public static final int KIND_LINE = 2; // 0x2
		@@ -16373,13 +16370,10 @@ package android.icu.text {
		method public abstract int getVariableTop();
		method public abstract android.icu.util.VersionInfo getVersion();
		method public boolean isFrozen();
		method public static final java.lang.Object registerFactory(android.icu.text.Collator.CollatorFactory);
		method public static final java.lang.Object registerInstance(android.icu.text.Collator, android.icu.util.ULocale);
		method public void setDecomposition(int);
		method public android.icu.text.Collator setMaxVariable(int);
		method public void setReorderCodes(int...);
		method public void setStrength(int);
		method public static final boolean unregister(java.lang.Object);
		field public static final int CANONICAL_DECOMPOSITION = 17; // 0x11
		field public static final int FULL_DECOMPOSITION = 15; // 0xf
		field public static final int IDENTICAL = 15; // 0xf
		@@ -16390,16 +16384,6 @@ package android.icu.text {
		field public static final int TERTIARY = 2; // 0x2
		}

		public static abstract class Collator.CollatorFactory {
		ctor protected Collator.CollatorFactory();
		method public android.icu.text.Collator createCollator(android.icu.util.ULocale);
		method public android.icu.text.Collator createCollator(java.util.Locale);
		method public java.lang.String getDisplayName(java.util.Locale, java.util.Locale);
		method public java.lang.String getDisplayName(android.icu.util.ULocale, android.icu.util.ULocale);
		method public abstract java.util.Set<java.lang.String> getSupportedLocaleIDs();
		method public boolean visible();
		}

		public static abstract interface Collator.ReorderCodes {
		field public static final int CURRENCY = 4099; // 0x1003
		field public static final int DEFAULT = -1; // 0xffffffff
		@@ -17259,7 +17243,6 @@ package android.icu.text {
		method public java.lang.Number parse(java.lang.String) throws java.text.ParseException;
		method public android.icu.util.CurrencyAmount parseCurrency(java.lang.CharSequence, java.text.ParsePosition);
		method public final java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
		method public static java.lang.Object registerFactory(android.icu.text.NumberFormat.NumberFormatFactory);
		method public void setContext(android.icu.text.DisplayContext);
		method public void setCurrency(android.icu.util.Currency);
		method public void setGroupingUsed(boolean);
		@@ -17270,7 +17253,6 @@ package android.icu.text {
		method public void setParseIntegerOnly(boolean);
		method public void setParseStrict(boolean);
		method public void setRoundingMode(int);
		method public static boolean unregister(java.lang.Object);
		field public static final int ACCOUNTINGCURRENCYSTYLE = 7; // 0x7
		field public static final int CASHCURRENCYSTYLE = 8; // 0x8
		field public static final int CURRENCYSTYLE = 1; // 0x1
		@@ -17299,28 +17281,6 @@ package android.icu.text {
		field public static final android.icu.text.NumberFormat.Field SIGN;
		}

		public static abstract class NumberFormat.NumberFormatFactory {
		ctor protected NumberFormat.NumberFormatFactory();
		method public android.icu.text.NumberFormat createFormat(android.icu.util.ULocale, int);
		method public android.icu.text.NumberFormat createFormat(java.util.Locale, int);
		method public abstract java.util.Set<java.lang.String> getSupportedLocaleNames();
		method public boolean visible();
		field public static final int FORMAT_CURRENCY = 1; // 0x1
		field public static final int FORMAT_INTEGER = 4; // 0x4
		field public static final int FORMAT_NUMBER = 0; // 0x0
		field public static final int FORMAT_PERCENT = 2; // 0x2
		field public static final int FORMAT_SCIENTIFIC = 3; // 0x3
		}

		public static abstract class NumberFormat.SimpleNumberFormatFactory extends android.icu.text.NumberFormat.NumberFormatFactory {
		ctor public NumberFormat.SimpleNumberFormatFactory(java.util.Locale);
		ctor public NumberFormat.SimpleNumberFormatFactory(java.util.Locale, boolean);
		ctor public NumberFormat.SimpleNumberFormatFactory(android.icu.util.ULocale);
		ctor public NumberFormat.SimpleNumberFormatFactory(android.icu.util.ULocale, boolean);
		method public final java.util.Set<java.lang.String> getSupportedLocaleNames();
		method public final boolean visible();
		}

		public class NumberingSystem {
		ctor public NumberingSystem();
		method public static java.lang.String[] getAvailableNames();
		@@ -18249,8 +18209,6 @@ package android.icu.util {
		method public java.lang.String getSymbol(java.util.Locale);
		method public java.lang.String getSymbol(android.icu.util.ULocale);
		method public static boolean isAvailable(java.lang.String, java.util.Date, java.util.Date);
		method public static java.lang.Object registerInstance(android.icu.util.Currency, android.icu.util.ULocale);
		method public static boolean unregister(java.lang.Object);
		field public static final int LONG_NAME = 1; // 0x1
		field public static final int PLURAL_LONG_NAME = 2; // 0x2
		field public static final int SYMBOL_NAME = 0; // 0x0

api/system-current.txt

+0 −42

Original line number	Diff line number	Diff line
		@@ -17487,11 +17487,8 @@ package android.icu.text {
		method public abstract int next();
		method public int preceding(int);
		method public abstract int previous();
		method public static java.lang.Object registerInstance(android.icu.text.BreakIterator, java.util.Locale, int);
		method public static java.lang.Object registerInstance(android.icu.text.BreakIterator, android.icu.util.ULocale, int);
		method public void setText(java.lang.String);
		method public abstract void setText(java.text.CharacterIterator);
		method public static boolean unregister(java.lang.Object);
		field public static final int DONE = -1; // 0xffffffff
		field public static final int KIND_CHARACTER = 0; // 0x0
		field public static final int KIND_LINE = 2; // 0x2
		@@ -17576,13 +17573,10 @@ package android.icu.text {
		method public abstract int getVariableTop();
		method public abstract android.icu.util.VersionInfo getVersion();
		method public boolean isFrozen();
		method public static final java.lang.Object registerFactory(android.icu.text.Collator.CollatorFactory);
		method public static final java.lang.Object registerInstance(android.icu.text.Collator, android.icu.util.ULocale);
		method public void setDecomposition(int);
		method public android.icu.text.Collator setMaxVariable(int);
		method public void setReorderCodes(int...);
		method public void setStrength(int);
		method public static final boolean unregister(java.lang.Object);
		field public static final int CANONICAL_DECOMPOSITION = 17; // 0x11
		field public static final int FULL_DECOMPOSITION = 15; // 0xf
		field public static final int IDENTICAL = 15; // 0xf
		@@ -17593,16 +17587,6 @@ package android.icu.text {
		field public static final int TERTIARY = 2; // 0x2
		}

		public static abstract class Collator.CollatorFactory {
		ctor protected Collator.CollatorFactory();
		method public android.icu.text.Collator createCollator(android.icu.util.ULocale);
		method public android.icu.text.Collator createCollator(java.util.Locale);
		method public java.lang.String getDisplayName(java.util.Locale, java.util.Locale);
		method public java.lang.String getDisplayName(android.icu.util.ULocale, android.icu.util.ULocale);
		method public abstract java.util.Set<java.lang.String> getSupportedLocaleIDs();
		method public boolean visible();
		}

		public static abstract interface Collator.ReorderCodes {
		field public static final int CURRENCY = 4099; // 0x1003
		field public static final int DEFAULT = -1; // 0xffffffff
		@@ -18462,7 +18446,6 @@ package android.icu.text {
		method public java.lang.Number parse(java.lang.String) throws java.text.ParseException;
		method public android.icu.util.CurrencyAmount parseCurrency(java.lang.CharSequence, java.text.ParsePosition);
		method public final java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
		method public static java.lang.Object registerFactory(android.icu.text.NumberFormat.NumberFormatFactory);
		method public void setContext(android.icu.text.DisplayContext);
		method public void setCurrency(android.icu.util.Currency);
		method public void setGroupingUsed(boolean);
		@@ -18473,7 +18456,6 @@ package android.icu.text {
		method public void setParseIntegerOnly(boolean);
		method public void setParseStrict(boolean);
		method public void setRoundingMode(int);
		method public static boolean unregister(java.lang.Object);
		field public static final int ACCOUNTINGCURRENCYSTYLE = 7; // 0x7
		field public static final int CASHCURRENCYSTYLE = 8; // 0x8
		field public static final int CURRENCYSTYLE = 1; // 0x1
		@@ -18502,28 +18484,6 @@ package android.icu.text {
		field public static final android.icu.text.NumberFormat.Field SIGN;
		}

		public static abstract class NumberFormat.NumberFormatFactory {
		ctor protected NumberFormat.NumberFormatFactory();
		method public android.icu.text.NumberFormat createFormat(android.icu.util.ULocale, int);
		method public android.icu.text.NumberFormat createFormat(java.util.Locale, int);
		method public abstract java.util.Set<java.lang.String> getSupportedLocaleNames();
		method public boolean visible();
		field public static final int FORMAT_CURRENCY = 1; // 0x1
		field public static final int FORMAT_INTEGER = 4; // 0x4
		field public static final int FORMAT_NUMBER = 0; // 0x0
		field public static final int FORMAT_PERCENT = 2; // 0x2
		field public static final int FORMAT_SCIENTIFIC = 3; // 0x3
		}

		public static abstract class NumberFormat.SimpleNumberFormatFactory extends android.icu.text.NumberFormat.NumberFormatFactory {
		ctor public NumberFormat.SimpleNumberFormatFactory(java.util.Locale);
		ctor public NumberFormat.SimpleNumberFormatFactory(java.util.Locale, boolean);
		ctor public NumberFormat.SimpleNumberFormatFactory(android.icu.util.ULocale);
		ctor public NumberFormat.SimpleNumberFormatFactory(android.icu.util.ULocale, boolean);
		method public final java.util.Set<java.lang.String> getSupportedLocaleNames();
		method public final boolean visible();
		}

		public class NumberingSystem {
		ctor public NumberingSystem();
		method public static java.lang.String[] getAvailableNames();
		@@ -19452,8 +19412,6 @@ package android.icu.util {
		method public java.lang.String getSymbol(java.util.Locale);
		method public java.lang.String getSymbol(android.icu.util.ULocale);
		method public static boolean isAvailable(java.lang.String, java.util.Date, java.util.Date);
		method public static java.lang.Object registerInstance(android.icu.util.Currency, android.icu.util.ULocale);
		method public static boolean unregister(java.lang.Object);
		field public static final int LONG_NAME = 1; // 0x1
		field public static final int PLURAL_LONG_NAME = 2; // 0x2
		field public static final int SYMBOL_NAME = 0; // 0x0

api/test-current.txt

+0 −42

Original line number	Diff line number	Diff line
		@@ -16296,11 +16296,8 @@ package android.icu.text {
		method public abstract int next();
		method public int preceding(int);
		method public abstract int previous();
		method public static java.lang.Object registerInstance(android.icu.text.BreakIterator, java.util.Locale, int);
		method public static java.lang.Object registerInstance(android.icu.text.BreakIterator, android.icu.util.ULocale, int);
		method public void setText(java.lang.String);
		method public abstract void setText(java.text.CharacterIterator);
		method public static boolean unregister(java.lang.Object);
		field public static final int DONE = -1; // 0xffffffff
		field public static final int KIND_CHARACTER = 0; // 0x0
		field public static final int KIND_LINE = 2; // 0x2
		@@ -16385,13 +16382,10 @@ package android.icu.text {
		method public abstract int getVariableTop();
		method public abstract android.icu.util.VersionInfo getVersion();
		method public boolean isFrozen();
		method public static final java.lang.Object registerFactory(android.icu.text.Collator.CollatorFactory);
		method public static final java.lang.Object registerInstance(android.icu.text.Collator, android.icu.util.ULocale);
		method public void setDecomposition(int);
		method public android.icu.text.Collator setMaxVariable(int);
		method public void setReorderCodes(int...);
		method public void setStrength(int);
		method public static final boolean unregister(java.lang.Object);
		field public static final int CANONICAL_DECOMPOSITION = 17; // 0x11
		field public static final int FULL_DECOMPOSITION = 15; // 0xf
		field public static final int IDENTICAL = 15; // 0xf
		@@ -16402,16 +16396,6 @@ package android.icu.text {
		field public static final int TERTIARY = 2; // 0x2
		}

		public static abstract class Collator.CollatorFactory {
		ctor protected Collator.CollatorFactory();
		method public android.icu.text.Collator createCollator(android.icu.util.ULocale);
		method public android.icu.text.Collator createCollator(java.util.Locale);
		method public java.lang.String getDisplayName(java.util.Locale, java.util.Locale);
		method public java.lang.String getDisplayName(android.icu.util.ULocale, android.icu.util.ULocale);
		method public abstract java.util.Set<java.lang.String> getSupportedLocaleIDs();
		method public boolean visible();
		}

		public static abstract interface Collator.ReorderCodes {
		field public static final int CURRENCY = 4099; // 0x1003
		field public static final int DEFAULT = -1; // 0xffffffff
		@@ -17271,7 +17255,6 @@ package android.icu.text {
		method public java.lang.Number parse(java.lang.String) throws java.text.ParseException;
		method public android.icu.util.CurrencyAmount parseCurrency(java.lang.CharSequence, java.text.ParsePosition);
		method public final java.lang.Object parseObject(java.lang.String, java.text.ParsePosition);
		method public static java.lang.Object registerFactory(android.icu.text.NumberFormat.NumberFormatFactory);
		method public void setContext(android.icu.text.DisplayContext);
		method public void setCurrency(android.icu.util.Currency);
		method public void setGroupingUsed(boolean);
		@@ -17282,7 +17265,6 @@ package android.icu.text {
		method public void setParseIntegerOnly(boolean);
		method public void setParseStrict(boolean);
		method public void setRoundingMode(int);
		method public static boolean unregister(java.lang.Object);
		field public static final int ACCOUNTINGCURRENCYSTYLE = 7; // 0x7
		field public static final int CASHCURRENCYSTYLE = 8; // 0x8
		field public static final int CURRENCYSTYLE = 1; // 0x1
		@@ -17311,28 +17293,6 @@ package android.icu.text {
		field public static final android.icu.text.NumberFormat.Field SIGN;
		}

		public static abstract class NumberFormat.NumberFormatFactory {
		ctor protected NumberFormat.NumberFormatFactory();
		method public android.icu.text.NumberFormat createFormat(android.icu.util.ULocale, int);
		method public android.icu.text.NumberFormat createFormat(java.util.Locale, int);
		method public abstract java.util.Set<java.lang.String> getSupportedLocaleNames();
		method public boolean visible();
		field public static final int FORMAT_CURRENCY = 1; // 0x1
		field public static final int FORMAT_INTEGER = 4; // 0x4
		field public static final int FORMAT_NUMBER = 0; // 0x0
		field public static final int FORMAT_PERCENT = 2; // 0x2
		field public static final int FORMAT_SCIENTIFIC = 3; // 0x3
		}

		public static abstract class NumberFormat.SimpleNumberFormatFactory extends android.icu.text.NumberFormat.NumberFormatFactory {
		ctor public NumberFormat.SimpleNumberFormatFactory(java.util.Locale);
		ctor public NumberFormat.SimpleNumberFormatFactory(java.util.Locale, boolean);
		ctor public NumberFormat.SimpleNumberFormatFactory(android.icu.util.ULocale);
		ctor public NumberFormat.SimpleNumberFormatFactory(android.icu.util.ULocale, boolean);
		method public final java.util.Set<java.lang.String> getSupportedLocaleNames();
		method public final boolean visible();
		}

		public class NumberingSystem {
		ctor public NumberingSystem();
		method public static java.lang.String[] getAvailableNames();
		@@ -18261,8 +18221,6 @@ package android.icu.util {
		method public java.lang.String getSymbol(java.util.Locale);
		method public java.lang.String getSymbol(android.icu.util.ULocale);
		method public static boolean isAvailable(java.lang.String, java.util.Date, java.util.Date);
		method public static java.lang.Object registerInstance(android.icu.util.Currency, android.icu.util.ULocale);
		method public static boolean unregister(java.lang.Object);
		field public static final int LONG_NAME = 1; // 0x1
		field public static final int PLURAL_LONG_NAME = 2; // 0x2
		field public static final int SYMBOL_NAME = 0; // 0x0