Merge "API updated for ICU4J 58.1" am: 9e3b160fc3 am: d20aebb443 am: c066d73c32 (b07ff470) · Commits · e / os / android_frameworks_base

api/current.txt

+60 −2

Original line number	Diff line number	Diff line
		@@ -15242,6 +15242,10 @@ package android.icu.lang {
		field public static final int CONTROL = 1; // 0x1
		field public static final int CR = 2; // 0x2
		field public static final int EXTEND = 3; // 0x3
		field public static final int E_BASE = 13; // 0xd
		field public static final int E_BASE_GAZ = 14; // 0xe
		field public static final int E_MODIFIER = 15; // 0xf
		field public static final int GLUE_AFTER_ZWJ = 16; // 0x10
		field public static final int L = 4; // 0x4
		field public static final int LF = 5; // 0x5
		field public static final int LV = 6; // 0x6
		@@ -15252,6 +15256,7 @@ package android.icu.lang {
		field public static final int SPACING_MARK = 10; // 0xa
		field public static final int T = 8; // 0x8
		field public static final int V = 9; // 0x9
		field public static final int ZWJ = 17; // 0x11
		}

		public static abstract interface UCharacter.HangulSyllableType {
		@@ -15264,6 +15269,9 @@ package android.icu.lang {
		}

		public static abstract interface UCharacter.JoiningGroup {
		field public static final int AFRICAN_FEH = 86; // 0x56
		field public static final int AFRICAN_NOON = 87; // 0x57
		field public static final int AFRICAN_QAF = 88; // 0x58
		field public static final int AIN = 1; // 0x1
		field public static final int ALAPH = 2; // 0x2
		field public static final int ALEF = 3; // 0x3
		@@ -15377,6 +15385,8 @@ package android.icu.lang {
		field public static final int CONDITIONAL_JAPANESE_STARTER = 37; // 0x25
		field public static final int CONTINGENT_BREAK = 7; // 0x7
		field public static final int EXCLAMATION = 11; // 0xb
		field public static final int E_BASE = 40; // 0x28
		field public static final int E_MODIFIER = 41; // 0x29
		field public static final int GLUE = 12; // 0xc
		field public static final int H2 = 31; // 0x1f
		field public static final int H3 = 32; // 0x20
		@@ -15403,6 +15413,7 @@ package android.icu.lang {
		field public static final int SURROGATE = 25; // 0x19
		field public static final int UNKNOWN = 0; // 0x0
		field public static final int WORD_JOINER = 30; // 0x1e
		field public static final int ZWJ = 42; // 0x2a
		field public static final int ZWSPACE = 28; // 0x1c
		}

		@@ -15436,6 +15447,8 @@ package android.icu.lang {
		method public int getID();
		method public static android.icu.lang.UCharacter.UnicodeBlock getInstance(int);
		method public static android.icu.lang.UCharacter.UnicodeBlock of(int);
		field public static final android.icu.lang.UCharacter.UnicodeBlock ADLAM;
		field public static final int ADLAM_ID = 263; // 0x107
		field public static final android.icu.lang.UCharacter.UnicodeBlock AEGEAN_NUMBERS;
		field public static final int AEGEAN_NUMBERS_ID = 119; // 0x77
		field public static final android.icu.lang.UCharacter.UnicodeBlock AHOM;
		@@ -15484,6 +15497,8 @@ package android.icu.lang {
		field public static final int BATAK_ID = 199; // 0xc7
		field public static final android.icu.lang.UCharacter.UnicodeBlock BENGALI;
		field public static final int BENGALI_ID = 16; // 0x10
		field public static final android.icu.lang.UCharacter.UnicodeBlock BHAIKSUKI;
		field public static final int BHAIKSUKI_ID = 264; // 0x108
		field public static final android.icu.lang.UCharacter.UnicodeBlock BLOCK_ELEMENTS;
		field public static final int BLOCK_ELEMENTS_ID = 53; // 0x35
		field public static final android.icu.lang.UCharacter.UnicodeBlock BOPOMOFO;
		@@ -15573,6 +15588,8 @@ package android.icu.lang {
		field public static final int CYRILLIC_EXTENDED_A_ID = 158; // 0x9e
		field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_EXTENDED_B;
		field public static final int CYRILLIC_EXTENDED_B_ID = 160; // 0xa0
		field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_EXTENDED_C;
		field public static final int CYRILLIC_EXTENDED_C_ID = 265; // 0x109
		field public static final int CYRILLIC_ID = 9; // 0x9
		field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_SUPPLEMENT;
		field public static final android.icu.lang.UCharacter.UnicodeBlock CYRILLIC_SUPPLEMENTARY;
		@@ -15626,6 +15643,8 @@ package android.icu.lang {
		field public static final int GEORGIAN_SUPPLEMENT_ID = 135; // 0x87
		field public static final android.icu.lang.UCharacter.UnicodeBlock GLAGOLITIC;
		field public static final int GLAGOLITIC_ID = 136; // 0x88
		field public static final android.icu.lang.UCharacter.UnicodeBlock GLAGOLITIC_SUPPLEMENT;
		field public static final int GLAGOLITIC_SUPPLEMENT_ID = 266; // 0x10a
		field public static final android.icu.lang.UCharacter.UnicodeBlock GOTHIC;
		field public static final int GOTHIC_ID = 89; // 0x59
		field public static final android.icu.lang.UCharacter.UnicodeBlock GRANTHA;
		@@ -15664,6 +15683,8 @@ package android.icu.lang {
		field public static final int HIRAGANA_ID = 62; // 0x3e
		field public static final android.icu.lang.UCharacter.UnicodeBlock IDEOGRAPHIC_DESCRIPTION_CHARACTERS;
		field public static final int IDEOGRAPHIC_DESCRIPTION_CHARACTERS_ID = 60; // 0x3c
		field public static final android.icu.lang.UCharacter.UnicodeBlock IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION;
		field public static final int IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION_ID = 267; // 0x10b
		field public static final android.icu.lang.UCharacter.UnicodeBlock IMPERIAL_ARAMAIC;
		field public static final int IMPERIAL_ARAMAIC_ID = 186; // 0xba
		field public static final android.icu.lang.UCharacter.UnicodeBlock INSCRIPTIONAL_PAHLAVI;
		@@ -15748,6 +15769,8 @@ package android.icu.lang {
		field public static final int MANDAIC_ID = 198; // 0xc6
		field public static final android.icu.lang.UCharacter.UnicodeBlock MANICHAEAN;
		field public static final int MANICHAEAN_ID = 234; // 0xea
		field public static final android.icu.lang.UCharacter.UnicodeBlock MARCHEN;
		field public static final int MARCHEN_ID = 268; // 0x10c
		field public static final android.icu.lang.UCharacter.UnicodeBlock MATHEMATICAL_ALPHANUMERIC_SYMBOLS;
		field public static final int MATHEMATICAL_ALPHANUMERIC_SYMBOLS_ID = 93; // 0x5d
		field public static final android.icu.lang.UCharacter.UnicodeBlock MATHEMATICAL_OPERATORS;
		@@ -15782,6 +15805,8 @@ package android.icu.lang {
		field public static final int MODI_ID = 236; // 0xec
		field public static final android.icu.lang.UCharacter.UnicodeBlock MONGOLIAN;
		field public static final int MONGOLIAN_ID = 37; // 0x25
		field public static final android.icu.lang.UCharacter.UnicodeBlock MONGOLIAN_SUPPLEMENT;
		field public static final int MONGOLIAN_SUPPLEMENT_ID = 269; // 0x10d
		field public static final android.icu.lang.UCharacter.UnicodeBlock MRO;
		field public static final int MRO_ID = 237; // 0xed
		field public static final android.icu.lang.UCharacter.UnicodeBlock MULTANI;
		@@ -15796,6 +15821,8 @@ package android.icu.lang {
		field public static final int MYANMAR_ID = 28; // 0x1c
		field public static final android.icu.lang.UCharacter.UnicodeBlock NABATAEAN;
		field public static final int NABATAEAN_ID = 239; // 0xef
		field public static final android.icu.lang.UCharacter.UnicodeBlock NEWA;
		field public static final int NEWA_ID = 270; // 0x10e
		field public static final android.icu.lang.UCharacter.UnicodeBlock NEW_TAI_LUE;
		field public static final int NEW_TAI_LUE_ID = 139; // 0x8b
		field public static final android.icu.lang.UCharacter.UnicodeBlock NKO;
		@@ -15827,6 +15854,8 @@ package android.icu.lang {
		field public static final int ORIYA_ID = 19; // 0x13
		field public static final android.icu.lang.UCharacter.UnicodeBlock ORNAMENTAL_DINGBATS;
		field public static final int ORNAMENTAL_DINGBATS_ID = 242; // 0xf2
		field public static final android.icu.lang.UCharacter.UnicodeBlock OSAGE;
		field public static final int OSAGE_ID = 271; // 0x10f
		field public static final android.icu.lang.UCharacter.UnicodeBlock OSMANYA;
		field public static final int OSMANYA_ID = 122; // 0x7a
		field public static final android.icu.lang.UCharacter.UnicodeBlock PAHAWH_HMONG;
		@@ -15929,6 +15958,10 @@ package android.icu.lang {
		field public static final int TAKRI_ID = 220; // 0xdc
		field public static final android.icu.lang.UCharacter.UnicodeBlock TAMIL;
		field public static final int TAMIL_ID = 20; // 0x14
		field public static final android.icu.lang.UCharacter.UnicodeBlock TANGUT;
		field public static final android.icu.lang.UCharacter.UnicodeBlock TANGUT_COMPONENTS;
		field public static final int TANGUT_COMPONENTS_ID = 273; // 0x111
		field public static final int TANGUT_ID = 272; // 0x110
		field public static final android.icu.lang.UCharacter.UnicodeBlock TELUGU;
		field public static final int TELUGU_ID = 21; // 0x15
		field public static final android.icu.lang.UCharacter.UnicodeBlock THAANA;
		@@ -15975,7 +16008,11 @@ package android.icu.lang {
		field public static final int DOUBLE_QUOTE = 16; // 0x10
		field public static final int EXTEND = 9; // 0x9
		field public static final int EXTENDNUMLET = 7; // 0x7
		field public static final int E_BASE = 17; // 0x11
		field public static final int E_BASE_GAZ = 18; // 0x12
		field public static final int E_MODIFIER = 19; // 0x13
		field public static final int FORMAT = 2; // 0x2
		field public static final int GLUE_AFTER_ZWJ = 20; // 0x14
		field public static final int HEBREW_LETTER = 14; // 0xe
		field public static final int KATAKANA = 3; // 0x3
		field public static final int LF = 10; // 0xa
		@@ -15987,6 +16024,7 @@ package android.icu.lang {
		field public static final int OTHER = 0; // 0x0
		field public static final int REGIONAL_INDICATOR = 13; // 0xd
		field public static final int SINGLE_QUOTE = 15; // 0xf
		field public static final int ZWJ = 21; // 0x15
		}

		public final class UCharacterCategory implements android.icu.lang.UCharacterEnums.ECharacterCategory {
		@@ -16205,6 +16243,7 @@ package android.icu.lang {
		method public static final boolean hasScript(int, int);
		method public static final boolean isCased(int);
		method public static final boolean isRightToLeft(int);
		field public static final int ADLAM = 167; // 0xa7
		field public static final int AFAKA = 147; // 0x93
		field public static final int AHOM = 161; // 0xa1
		field public static final int ANATOLIAN_HIEROGLYPHS = 156; // 0x9c
		@@ -16216,6 +16255,7 @@ package android.icu.lang {
		field public static final int BASSA_VAH = 134; // 0x86
		field public static final int BATAK = 63; // 0x3f
		field public static final int BENGALI = 4; // 0x4
		field public static final int BHAIKSUKI = 168; // 0xa8
		field public static final int BLISSYMBOLS = 64; // 0x40
		field public static final int BOOK_PAHLAVI = 124; // 0x7c
		field public static final int BOPOMOFO = 5; // 0x5
		@@ -16254,6 +16294,7 @@ package android.icu.lang {
		field public static final int HAN = 17; // 0x11
		field public static final int HANGUL = 18; // 0x12
		field public static final int HANUNOO = 43; // 0x2b
		field public static final int HAN_WITH_BOPOMOFO = 172; // 0xac
		field public static final int HARAPPAN_INDUS = 77; // 0x4d
		field public static final int HATRAN = 162; // 0xa2
		field public static final int HEBREW = 19; // 0x13
		@@ -16264,6 +16305,7 @@ package android.icu.lang {
		field public static final int INSCRIPTIONAL_PAHLAVI = 122; // 0x7a
		field public static final int INSCRIPTIONAL_PARTHIAN = 125; // 0x7d
		field public static final int INVALID_CODE = -1; // 0xffffffff
		field public static final int JAMO = 173; // 0xad
		field public static final int JAPANESE = 105; // 0x69
		field public static final int JAVANESE = 78; // 0x4e
		field public static final int JURCHEN = 148; // 0x94
		@@ -16297,6 +16339,7 @@ package android.icu.lang {
		field public static final int MANDAEAN = 84; // 0x54
		field public static final int MANDAIC = 84; // 0x54
		field public static final int MANICHAEAN = 121; // 0x79
		field public static final int MARCHEN = 169; // 0xa9
		field public static final int MATHEMATICAL_NOTATION = 128; // 0x80
		field public static final int MAYAN_HIEROGLYPHS = 85; // 0x55
		field public static final int MEITEI_MAYEK = 115; // 0x73
		@@ -16313,6 +16356,7 @@ package android.icu.lang {
		field public static final int MYANMAR = 28; // 0x1c
		field public static final int NABATAEAN = 143; // 0x8f
		field public static final int NAKHI_GEBA = 132; // 0x84
		field public static final int NEWA = 170; // 0xaa
		field public static final int NEW_TAI_LUE = 59; // 0x3b
		field public static final int NKO = 87; // 0x57
		field public static final int NUSHU = 150; // 0x96
		@@ -16327,6 +16371,7 @@ package android.icu.lang {
		field public static final int OL_CHIKI = 109; // 0x6d
		field public static final int ORIYA = 31; // 0x1f
		field public static final int ORKHON = 88; // 0x58
		field public static final int OSAGE = 171; // 0xab
		field public static final int OSMANYA = 50; // 0x32
		field public static final int PAHAWH_HMONG = 75; // 0x4b
		field public static final int PALMYRENE = 144; // 0x90
		@@ -16352,6 +16397,7 @@ package android.icu.lang {
		field public static final int SUNDANESE = 113; // 0x71
		field public static final int SYLOTI_NAGRI = 58; // 0x3a
		field public static final int SYMBOLS = 129; // 0x81
		field public static final int SYMBOLS_EMOJI = 174; // 0xae
		field public static final int SYRIAC = 34; // 0x22
		field public static final int TAGALOG = 42; // 0x2a
		field public static final int TAGBANWA = 45; // 0x2d
		@@ -16878,6 +16924,8 @@ package android.icu.text {
		method public static final android.icu.text.DateFormat.BooleanAttribute[] values();
		enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_ALLOW_NUMERIC;
		enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_ALLOW_WHITESPACE;
		enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_MULTIPLE_PATTERNS_FOR_MATCH;
		enum_constant public static final android.icu.text.DateFormat.BooleanAttribute PARSE_PARTIAL_LITERAL_MATCH;
		}

		public static class DateFormat.Field extends java.text.Format.Field {
		@@ -17562,6 +17610,7 @@ package android.icu.text {
		field public static final int PERCENTSTYLE = 2; // 0x2
		field public static final int PLURALCURRENCYSTYLE = 6; // 0x6
		field public static final int SCIENTIFICSTYLE = 3; // 0x3
		field public static final int STANDARDCURRENCYSTYLE = 9; // 0x9
		}

		public static class NumberFormat.Field extends java.text.Format.Field {
		@@ -18356,7 +18405,7 @@ package android.icu.util {
		field public static final int AM_PM = 9; // 0x9
		field public static final int APRIL = 3; // 0x3
		field public static final int AUGUST = 7; // 0x7
		field protected static final int BASE_FIELD_COUNT = 23; // 0x17
		field protected static final deprecated int BASE_FIELD_COUNT = 23; // 0x17
		field public static final int DATE = 5; // 0x5
		field public static final int DAY_OF_MONTH = 5; // 0x5
		field public static final int DAY_OF_WEEK = 7; // 0x7
		@@ -18384,7 +18433,7 @@ package android.icu.util {
		field public static final int MARCH = 2; // 0x2
		field protected static final int MAXIMUM = 3; // 0x3
		field protected static final java.util.Date MAX_DATE;
		field protected static final int MAX_FIELD_COUNT = 32; // 0x20
		field protected static final deprecated int MAX_FIELD_COUNT = 32; // 0x20
		field protected static final int MAX_JULIAN = 2130706432; // 0x7f000000
		field protected static final long MAX_MILLIS = 183882168921600000L; // 0x28d47dbbf19b000L
		field public static final int MAY = 4; // 0x4
		@@ -18704,6 +18753,7 @@ package android.icu.util {
		field public static final android.icu.util.MeasureUnit CELSIUS;
		field public static final android.icu.util.MeasureUnit CENTILITER;
		field public static final android.icu.util.MeasureUnit CENTIMETER;
		field public static final android.icu.util.MeasureUnit CENTURY;
		field public static final android.icu.util.MeasureUnit CUBIC_CENTIMETER;
		field public static final android.icu.util.MeasureUnit CUBIC_FOOT;
		field public static final android.icu.util.MeasureUnit CUBIC_INCH;
		@@ -18712,6 +18762,7 @@ package android.icu.util {
		field public static final android.icu.util.MeasureUnit CUBIC_MILE;
		field public static final android.icu.util.MeasureUnit CUBIC_YARD;
		field public static final android.icu.util.MeasureUnit CUP;
		field public static final android.icu.util.MeasureUnit CUP_METRIC;
		field public static final android.icu.util.TimeUnit DAY;
		field public static final android.icu.util.MeasureUnit DECILITER;
		field public static final android.icu.util.MeasureUnit DECIMETER;
		@@ -18723,6 +18774,7 @@ package android.icu.util {
		field public static final android.icu.util.MeasureUnit FOOT;
		field public static final android.icu.util.MeasureUnit FURLONG;
		field public static final android.icu.util.MeasureUnit GALLON;
		field public static final android.icu.util.MeasureUnit GENERIC_TEMPERATURE;
		field public static final android.icu.util.MeasureUnit GIGABIT;
		field public static final android.icu.util.MeasureUnit GIGABYTE;
		field public static final android.icu.util.MeasureUnit GIGAHERTZ;
		@@ -18750,8 +18802,10 @@ package android.icu.util {
		field public static final android.icu.util.MeasureUnit KILOMETER_PER_HOUR;
		field public static final android.icu.util.MeasureUnit KILOWATT;
		field public static final android.icu.util.MeasureUnit KILOWATT_HOUR;
		field public static final android.icu.util.MeasureUnit KNOT;
		field public static final android.icu.util.MeasureUnit LIGHT_YEAR;
		field public static final android.icu.util.MeasureUnit LITER;
		field public static final android.icu.util.MeasureUnit LITER_PER_100KILOMETERS;
		field public static final android.icu.util.MeasureUnit LITER_PER_KILOMETER;
		field public static final android.icu.util.MeasureUnit LUX;
		field public static final android.icu.util.MeasureUnit MEGABIT;
		@@ -18769,6 +18823,7 @@ package android.icu.util {
		field public static final android.icu.util.MeasureUnit MILE;
		field public static final android.icu.util.MeasureUnit MILE_PER_GALLON;
		field public static final android.icu.util.MeasureUnit MILE_PER_HOUR;
		field public static final android.icu.util.MeasureUnit MILE_SCANDINAVIAN;
		field public static final android.icu.util.MeasureUnit MILLIAMPERE;
		field public static final android.icu.util.MeasureUnit MILLIBAR;
		field public static final android.icu.util.MeasureUnit MILLIGRAM;
		@@ -18788,10 +18843,12 @@ package android.icu.util {
		field public static final android.icu.util.MeasureUnit PARSEC;
		field public static final android.icu.util.MeasureUnit PICOMETER;
		field public static final android.icu.util.MeasureUnit PINT;
		field public static final android.icu.util.MeasureUnit PINT_METRIC;
		field public static final android.icu.util.MeasureUnit POUND;
		field public static final android.icu.util.MeasureUnit POUND_PER_SQUARE_INCH;
		field public static final android.icu.util.MeasureUnit QUART;
		field public static final android.icu.util.MeasureUnit RADIAN;
		field public static final android.icu.util.MeasureUnit REVOLUTION_ANGLE;
		field public static final android.icu.util.TimeUnit SECOND;
		field public static final android.icu.util.MeasureUnit SQUARE_CENTIMETER;
		field public static final android.icu.util.MeasureUnit SQUARE_FOOT;
		@@ -19103,6 +19160,7 @@ package android.icu.util {
		field public static final android.icu.util.VersionInfo UNICODE_6_3;
		field public static final android.icu.util.VersionInfo UNICODE_7_0;
		field public static final android.icu.util.VersionInfo UNICODE_8_0;
		field public static final android.icu.util.VersionInfo UNICODE_9_0;
		}

		}

api/system-current.txt

+60 −2

File changed.

Preview size limit exceeded, changes collapsed.

api/test-current.txt

+60 −2

File changed.

Preview size limit exceeded, changes collapsed.