Remove RawCollationKey/ByteArrayWrapper from the public API
Bug: 22023363
(cherry picked from commit ad586b28fcfaa08bd930b5728975f6a3c182d553)
Change-Id: Ib4fe5c19909ba3e6892efa60efa0e6a2d0be145a
diff --git a/android_icu4j/src/main/java/android/icu/text/CollationKey.java b/android_icu4j/src/main/java/android/icu/text/CollationKey.java
index 97415ee..c81e1de 100644
--- a/android_icu4j/src/main/java/android/icu/text/CollationKey.java
+++ b/android_icu4j/src/main/java/android/icu/text/CollationKey.java
@@ -164,6 +164,7 @@
* argument source.
* @see Collator
* @see RawCollationKey
+ * @hide unsupported on Android
*/
public CollationKey(String source, RawCollationKey key)
{
diff --git a/android_icu4j/src/main/java/android/icu/text/Collator.java b/android_icu4j/src/main/java/android/icu/text/Collator.java
index 0317b88..2ba0c02 100644
--- a/android_icu4j/src/main/java/android/icu/text/Collator.java
+++ b/android_icu4j/src/main/java/android/icu/text/Collator.java
@@ -1222,6 +1222,7 @@
* @see #compare(String, String)
* @see #getCollationKey
* @see RawCollationKey
+ * @hide unsupported on Android
*/
public abstract RawCollationKey getRawCollationKey(String source,
RawCollationKey key);
diff --git a/android_icu4j/src/main/java/android/icu/text/RawCollationKey.java b/android_icu4j/src/main/java/android/icu/text/RawCollationKey.java
index 70d47c7..82d48c5 100644
--- a/android_icu4j/src/main/java/android/icu/text/RawCollationKey.java
+++ b/android_icu4j/src/main/java/android/icu/text/RawCollationKey.java
@@ -38,6 +38,7 @@
* See class documentation for Collator.</p>
* @see RuleBasedCollator
* @see CollationKey
+ * @hide Only a subset of ICU is exposed in Android
*/
public final class RawCollationKey extends ByteArrayWrapper
{
diff --git a/android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java b/android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java
index d77ff6a..a1dd909 100644
--- a/android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java
+++ b/android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java
@@ -1053,6 +1053,7 @@
* @see #getCollationKey
* @see #compare(String, String)
* @see RawCollationKey
+ * @hide unsupported on Android
*/
@Override
public RawCollationKey getRawCollationKey(String source, RawCollationKey key) {
diff --git a/android_icu4j/src/main/java/android/icu/util/ByteArrayWrapper.java b/android_icu4j/src/main/java/android/icu/util/ByteArrayWrapper.java
index 6868942..91a4a1b 100644
--- a/android_icu4j/src/main/java/android/icu/util/ByteArrayWrapper.java
+++ b/android_icu4j/src/main/java/android/icu/util/ByteArrayWrapper.java
@@ -20,6 +20,7 @@
* size when necessary.
*
* @author syn wee
+ * @hide Only a subset of ICU is exposed in Android
*/
public class ByteArrayWrapper implements Comparable<ByteArrayWrapper>
{
diff --git a/tools/srcgen/src/main/java/com/android/icu4j/srcgen/Icu4jTransform.java b/tools/srcgen/src/main/java/com/android/icu4j/srcgen/Icu4jTransform.java
index 0c67659..00e3674 100644
--- a/tools/srcgen/src/main/java/com/android/icu4j/srcgen/Icu4jTransform.java
+++ b/tools/srcgen/src/main/java/com/android/icu4j/srcgen/Icu4jTransform.java
@@ -88,7 +88,6 @@
"android.icu.text.NumberingSystem",
"android.icu.text.PluralFormat",
"android.icu.text.PluralRules",
- "android.icu.text.RawCollationKey",
"android.icu.text.RelativeDateTimeFormatter",
"android.icu.text.Replaceable",
"android.icu.text.RuleBasedCollator",
@@ -108,7 +107,6 @@
"android.icu.text.UnicodeSetIterator",
"android.icu.text.UnicodeSetSpanner",
"android.icu.util.BuddhistCalendar",
- "android.icu.util.ByteArrayWrapper",
"android.icu.util.Calendar",
"android.icu.util.CECalendar",
"android.icu.util.ChineseCalendar",
@@ -506,6 +504,9 @@
/* ASCII order please. */
"field:android.icu.util.TimeZone#TIMEZONE_ICU",
"field:android.icu.util.TimeZone#TIMEZONE_JDK",
+ "method:android.icu.text.CollationKey#CollationKey(String,RawCollationKey)",
+ "method:android.icu.text.Collator#getRawCollationKey(String,RawCollationKey)",
+ "method:android.icu.text.RuleBasedCollator#getRawCollationKey(String,RawCollationKey)",
"method:android.icu.text.UnicodeSet#addAllTo(Iterable<T>,T[])",
"method:android.icu.text.UnicodeSet#addAllTo(Iterable<T>,U)",
"method:android.icu.text.UnicodeSet#addAllTo(String[])",
