diff --git a/api/current.txt b/api/current.txt index 7ec72a0c0f088..c6e4b88590616 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16257,7 +16257,6 @@ package android.icu.text { public final class CollationKey implements java.lang.Comparable { ctor public CollationKey(java.lang.String, byte[]); - ctor public CollationKey(java.lang.String, android.icu.text.RawCollationKey); method public int compareTo(android.icu.text.CollationKey); method public boolean equals(android.icu.text.CollationKey); method public android.icu.text.CollationKey getBound(int, int); @@ -16298,7 +16297,6 @@ package android.icu.text { method public static final java.lang.String[] getKeywordValuesForLocale(java.lang.String, android.icu.util.ULocale, boolean); method public static final java.lang.String[] getKeywords(); method public int getMaxVariable(); - method public abstract android.icu.text.RawCollationKey getRawCollationKey(java.lang.String, android.icu.text.RawCollationKey); method public int[] getReorderCodes(); method public int getStrength(); method public android.icu.text.UnicodeSet getTailoredSet(); @@ -17323,14 +17321,6 @@ package android.icu.text { enum_constant public static final android.icu.text.PluralRules.PluralType ORDINAL; } - public final class RawCollationKey extends android.icu.util.ByteArrayWrapper { - ctor public RawCollationKey(); - ctor public RawCollationKey(int); - ctor public RawCollationKey(byte[]); - ctor public RawCollationKey(byte[], int); - method public int compareTo(android.icu.text.RawCollationKey); - } - public final class RelativeDateTimeFormatter { method public java.lang.String combineDateAndTime(java.lang.String, java.lang.String); method public java.lang.String format(double, android.icu.text.RelativeDateTimeFormatter.Direction, android.icu.text.RelativeDateTimeFormatter.RelativeUnit); @@ -17414,7 +17404,6 @@ package android.icu.text { method public android.icu.text.CollationKey getCollationKey(java.lang.String); method public void getContractionsAndExpansions(android.icu.text.UnicodeSet, android.icu.text.UnicodeSet, boolean) throws java.lang.Exception; method public boolean getNumericCollation(); - method public android.icu.text.RawCollationKey getRawCollationKey(java.lang.String, android.icu.text.RawCollationKey); method public java.lang.String getRules(); method public java.lang.String getRules(boolean); method public android.icu.util.VersionInfo getUCAVersion(); @@ -17909,19 +17898,6 @@ package android.icu.util { field public static final int BE = 0; // 0x0 } - public class ByteArrayWrapper implements java.lang.Comparable { - ctor public ByteArrayWrapper(); - ctor public ByteArrayWrapper(byte[], int); - ctor public ByteArrayWrapper(java.nio.ByteBuffer); - method public final android.icu.util.ByteArrayWrapper append(byte[], int, int); - method public int compareTo(android.icu.util.ByteArrayWrapper); - method public android.icu.util.ByteArrayWrapper ensureCapacity(int); - method public final byte[] releaseBytes(); - method public final android.icu.util.ByteArrayWrapper set(byte[], int, int); - field public byte[] bytes; - field public int size; - } - abstract class CECalendar extends android.icu.util.Calendar { ctor protected CECalendar(); ctor protected CECalendar(android.icu.util.TimeZone); diff --git a/api/system-current.txt b/api/system-current.txt index 23e2253e4fe2c..9d74b9fc7df8f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -17430,7 +17430,6 @@ package android.icu.text { public final class CollationKey implements java.lang.Comparable { ctor public CollationKey(java.lang.String, byte[]); - ctor public CollationKey(java.lang.String, android.icu.text.RawCollationKey); method public int compareTo(android.icu.text.CollationKey); method public boolean equals(android.icu.text.CollationKey); method public android.icu.text.CollationKey getBound(int, int); @@ -17471,7 +17470,6 @@ package android.icu.text { method public static final java.lang.String[] getKeywordValuesForLocale(java.lang.String, android.icu.util.ULocale, boolean); method public static final java.lang.String[] getKeywords(); method public int getMaxVariable(); - method public abstract android.icu.text.RawCollationKey getRawCollationKey(java.lang.String, android.icu.text.RawCollationKey); method public int[] getReorderCodes(); method public int getStrength(); method public android.icu.text.UnicodeSet getTailoredSet(); @@ -18496,14 +18494,6 @@ package android.icu.text { enum_constant public static final android.icu.text.PluralRules.PluralType ORDINAL; } - public final class RawCollationKey extends android.icu.util.ByteArrayWrapper { - ctor public RawCollationKey(); - ctor public RawCollationKey(int); - ctor public RawCollationKey(byte[]); - ctor public RawCollationKey(byte[], int); - method public int compareTo(android.icu.text.RawCollationKey); - } - public final class RelativeDateTimeFormatter { method public java.lang.String combineDateAndTime(java.lang.String, java.lang.String); method public java.lang.String format(double, android.icu.text.RelativeDateTimeFormatter.Direction, android.icu.text.RelativeDateTimeFormatter.RelativeUnit); @@ -18587,7 +18577,6 @@ package android.icu.text { method public android.icu.text.CollationKey getCollationKey(java.lang.String); method public void getContractionsAndExpansions(android.icu.text.UnicodeSet, android.icu.text.UnicodeSet, boolean) throws java.lang.Exception; method public boolean getNumericCollation(); - method public android.icu.text.RawCollationKey getRawCollationKey(java.lang.String, android.icu.text.RawCollationKey); method public java.lang.String getRules(); method public java.lang.String getRules(boolean); method public android.icu.util.VersionInfo getUCAVersion(); @@ -19082,19 +19071,6 @@ package android.icu.util { field public static final int BE = 0; // 0x0 } - public class ByteArrayWrapper implements java.lang.Comparable { - ctor public ByteArrayWrapper(); - ctor public ByteArrayWrapper(byte[], int); - ctor public ByteArrayWrapper(java.nio.ByteBuffer); - method public final android.icu.util.ByteArrayWrapper append(byte[], int, int); - method public int compareTo(android.icu.util.ByteArrayWrapper); - method public android.icu.util.ByteArrayWrapper ensureCapacity(int); - method public final byte[] releaseBytes(); - method public final android.icu.util.ByteArrayWrapper set(byte[], int, int); - field public byte[] bytes; - field public int size; - } - abstract class CECalendar extends android.icu.util.Calendar { ctor protected CECalendar(); ctor protected CECalendar(android.icu.util.TimeZone); diff --git a/api/test-current.txt b/api/test-current.txt index 5a514f7021e63..9d99a3f3a933a 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -16267,7 +16267,6 @@ package android.icu.text { public final class CollationKey implements java.lang.Comparable { ctor public CollationKey(java.lang.String, byte[]); - ctor public CollationKey(java.lang.String, android.icu.text.RawCollationKey); method public int compareTo(android.icu.text.CollationKey); method public boolean equals(android.icu.text.CollationKey); method public android.icu.text.CollationKey getBound(int, int); @@ -16308,7 +16307,6 @@ package android.icu.text { method public static final java.lang.String[] getKeywordValuesForLocale(java.lang.String, android.icu.util.ULocale, boolean); method public static final java.lang.String[] getKeywords(); method public int getMaxVariable(); - method public abstract android.icu.text.RawCollationKey getRawCollationKey(java.lang.String, android.icu.text.RawCollationKey); method public int[] getReorderCodes(); method public int getStrength(); method public android.icu.text.UnicodeSet getTailoredSet(); @@ -17333,14 +17331,6 @@ package android.icu.text { enum_constant public static final android.icu.text.PluralRules.PluralType ORDINAL; } - public final class RawCollationKey extends android.icu.util.ByteArrayWrapper { - ctor public RawCollationKey(); - ctor public RawCollationKey(int); - ctor public RawCollationKey(byte[]); - ctor public RawCollationKey(byte[], int); - method public int compareTo(android.icu.text.RawCollationKey); - } - public final class RelativeDateTimeFormatter { method public java.lang.String combineDateAndTime(java.lang.String, java.lang.String); method public java.lang.String format(double, android.icu.text.RelativeDateTimeFormatter.Direction, android.icu.text.RelativeDateTimeFormatter.RelativeUnit); @@ -17424,7 +17414,6 @@ package android.icu.text { method public android.icu.text.CollationKey getCollationKey(java.lang.String); method public void getContractionsAndExpansions(android.icu.text.UnicodeSet, android.icu.text.UnicodeSet, boolean) throws java.lang.Exception; method public boolean getNumericCollation(); - method public android.icu.text.RawCollationKey getRawCollationKey(java.lang.String, android.icu.text.RawCollationKey); method public java.lang.String getRules(); method public java.lang.String getRules(boolean); method public android.icu.util.VersionInfo getUCAVersion(); @@ -17919,19 +17908,6 @@ package android.icu.util { field public static final int BE = 0; // 0x0 } - public class ByteArrayWrapper implements java.lang.Comparable { - ctor public ByteArrayWrapper(); - ctor public ByteArrayWrapper(byte[], int); - ctor public ByteArrayWrapper(java.nio.ByteBuffer); - method public final android.icu.util.ByteArrayWrapper append(byte[], int, int); - method public int compareTo(android.icu.util.ByteArrayWrapper); - method public android.icu.util.ByteArrayWrapper ensureCapacity(int); - method public final byte[] releaseBytes(); - method public final android.icu.util.ByteArrayWrapper set(byte[], int, int); - field public byte[] bytes; - field public int size; - } - abstract class CECalendar extends android.icu.util.Calendar { ctor protected CECalendar(); ctor protected CECalendar(android.icu.util.TimeZone);