release-request-60f1fc0d-1c6d-400a-8b4e-444f1452f036-for-git_oc-mr1-release-4157261 snap-temp-L11100000079944679
Change-Id: Ifc3570a161b9d5099546362e6fb9a477c70c7e86
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 1d243a0..1d7b8b4 100644
--- a/android_icu4j/src/main/java/android/icu/text/Collator.java
+++ b/android_icu4j/src/main/java/android/icu/text/Collator.java
@@ -1228,7 +1228,6 @@
* CollationKey is returned.
* @see CollationKey
* @see #compare(String, String)
- * @see #getRawCollationKey
*/
public abstract CollationKey getCollationKey(String source);
diff --git a/android_icu4j/src/main/java/android/icu/text/DecimalFormatSymbols.java b/android_icu4j/src/main/java/android/icu/text/DecimalFormatSymbols.java
index bc82220..5870cc7 100644
--- a/android_icu4j/src/main/java/android/icu/text/DecimalFormatSymbols.java
+++ b/android_icu4j/src/main/java/android/icu/text/DecimalFormatSymbols.java
@@ -164,7 +164,6 @@
/**
* Returns the array of characters used as digits, in order from 0 through 9
* @return The array
- * @see #getDigitStrings()
*/
public char[] getDigits() {
return digits.clone();
@@ -298,7 +297,6 @@
/**
* Sets the character used for grouping separator. Different for French, etc.
* @param groupingSeparator the thousands character
- * @see #setGroupingSeparatorString(String)
*/
public void setGroupingSeparator(char groupingSeparator) {
this.groupingSeparator = groupingSeparator;
diff --git a/android_icu4j/src/main/java/android/icu/text/Normalizer.java b/android_icu4j/src/main/java/android/icu/text/Normalizer.java
index 25121e5..4414cfe 100644
--- a/android_icu4j/src/main/java/android/icu/text/Normalizer.java
+++ b/android_icu4j/src/main/java/android/icu/text/Normalizer.java
@@ -1177,9 +1177,6 @@
*
*
* @return <0 or 0 or >0 as usual for string comparisons
- *
- * @see #normalize
- * @see #FCD
*/
public static int compare(char[] s1, int s1Start, int s1Limit,
char[] s2, int s2Start, int s2Limit,
@@ -1237,9 +1234,6 @@
* If set, then the following case folding options are used.
*
* @return <0 or 0 or >0 as usual for string comparisons
- *
- * @see #normalize
- * @see #FCD
*/
public static int compare(String s1, String s2, int options) {
return internalCompare(s1, s2, options);
@@ -1273,9 +1267,6 @@
* If set, then the following case folding options are used.
*
* @return <0 or 0 or >0 as usual for string comparisons
- *
- * @see #normalize
- * @see #FCD
*/
public static int compare(char[] s1, char[] s2, int options) {
return internalCompare(CharBuffer.wrap(s1), CharBuffer.wrap(s2), options);
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 8b59af9..2c2b950 100644
--- a/android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java
+++ b/android_icu4j/src/main/java/android/icu/text/RuleBasedCollator.java
@@ -1025,7 +1025,6 @@
* String is null, a null CollationKey is returned.
* @see CollationKey
* @see #compare(String, String)
- * @see #getRawCollationKey
*/
@Override
public CollationKey getCollationKey(String source) {
diff --git a/android_icu4j/src/main/java/android/icu/util/Calendar.java b/android_icu4j/src/main/java/android/icu/util/Calendar.java
index c06e360..92b5ca3 100644
--- a/android_icu4j/src/main/java/android/icu/util/Calendar.java
+++ b/android_icu4j/src/main/java/android/icu/util/Calendar.java
@@ -4499,8 +4499,6 @@
* @param date the date and time
* @return true if the given date and time is part of the
* weekend
- * @see #getDayOfWeekType
- * @see #getWeekendTransition
* @see #isWeekend()
*/
public boolean isWeekend(Date date) {
@@ -4513,8 +4511,6 @@
* this calendar system.
* @return true if the given date and time is part of the
* weekend
- * @see #getDayOfWeekType
- * @see #getWeekendTransition
* @see #isWeekend(Date)
*/
public boolean isWeekend() {
diff --git a/tools/srcgen/resources/replacements.txt b/tools/srcgen/resources/replacements.txt
index 6c67d13..a51a661 100644
--- a/tools/srcgen/resources/replacements.txt
+++ b/tools/srcgen/resources/replacements.txt
@@ -406,7 +406,6 @@
* Returns the array of characters used as digits, in order from 0 through 9
* @return The array
* @stable ICU 4.6
- * @see #getDigitStrings()
*/
--
@@ -501,3 +500,223 @@
* @stable ICU 3.6
*/
--
+
+# Removal of reference to method that is not exposed in Android API
+--method:android.icu.text.DecimalFormatSymbols#setGroupingSeparator(char)
+/**
+ * Sets the character used for grouping separator. Different for French, etc.
+ * @param groupingSeparator the thousands character
+ * @stable ICU 2.0
+ */
+--
+
+# Removal of reference to method that is not exposed in Android API
+--method:android.icu.text.Normalizer#compare(char[],char[],int)
+/**
+ * Compare two strings for canonical equivalence.
+ * Further options include case-insensitive comparison and
+ * code point order (as opposed to code unit order).
+ * Convenience method.
+ *
+ * @param s1 First source string.
+ * @param s2 Second source string.
+ *
+ * @param options A bit set of options:
+ * - FOLD_CASE_DEFAULT or 0 is used for default options:
+ * Case-sensitive comparison in code unit order, and the input strings
+ * are quick-checked for FCD.
+ *
+ * - INPUT_IS_FCD
+ * Set if the caller knows that both s1 and s2 fulfill the FCD
+ * conditions. If not set, the function will quickCheck for FCD
+ * and normalize if necessary.
+ *
+ * - COMPARE_CODE_POINT_ORDER
+ * Set to choose code point order instead of code unit order
+ *
+ * - COMPARE_IGNORE_CASE
+ * Set to compare strings case-insensitively using case folding,
+ * instead of case-sensitively.
+ * If set, then the following case folding options are used.
+ *
+ * @return <0 or 0 or >0 as usual for string comparisons
+ *
+ * @stable ICU 2.8
+ */
+--
+
+# Removal of reference to method that is not exposed in Android API
+--method:android.icu.text.Normalizer#compare(char[],int,int,char[],int,int,int)
+/**
+ * Compare two strings for canonical equivalence.
+ * Further options include case-insensitive comparison and
+ * code point order (as opposed to code unit order).
+ *
+ * Canonical equivalence between two strings is defined as their normalized
+ * forms (NFD or NFC) being identical.
+ * This function compares strings incrementally instead of normalizing
+ * (and optionally case-folding) both strings entirely,
+ * improving performance significantly.
+ *
+ * Bulk normalization is only necessary if the strings do not fulfill the
+ * FCD conditions. Only in this case, and only if the strings are relatively
+ * long, is memory allocated temporarily.
+ * For FCD strings and short non-FCD strings there is no memory allocation.
+ *
+ * Semantically, this is equivalent to
+ * strcmp[CodePointOrder](foldCase(NFD(s1)), foldCase(NFD(s2)))
+ * where code point order and foldCase are all optional.
+ *
+ * @param s1 First source character array.
+ * @param s1Start start index of source
+ * @param s1Limit limit of the source
+ *
+ * @param s2 Second source character array.
+ * @param s2Start start index of the source
+ * @param s2Limit limit of the source
+ *
+ * @param options A bit set of options:
+ * - FOLD_CASE_DEFAULT or 0 is used for default options:
+ * Case-sensitive comparison in code unit order, and the input strings
+ * are quick-checked for FCD.
+ *
+ * - INPUT_IS_FCD
+ * Set if the caller knows that both s1 and s2 fulfill the FCD
+ * conditions.If not set, the function will quickCheck for FCD
+ * and normalize if necessary.
+ *
+ * - COMPARE_CODE_POINT_ORDER
+ * Set to choose code point order instead of code unit order
+ *
+ * - COMPARE_IGNORE_CASE
+ * Set to compare strings case-insensitively using case folding,
+ * instead of case-sensitively.
+ * If set, then the following case folding options are used.
+ *
+ *
+ * @return <0 or 0 or >0 as usual for string comparisons
+ *
+ * @stable ICU 2.8
+ */
+--
+
+# Removal of reference to method that is not exposed in Android API
+--method:android.icu.text.Normalizer#compare(String,String,int)
+/**
+ * Compare two strings for canonical equivalence.
+ * Further options include case-insensitive comparison and
+ * code point order (as opposed to code unit order).
+ *
+ * Canonical equivalence between two strings is defined as their normalized
+ * forms (NFD or NFC) being identical.
+ * This function compares strings incrementally instead of normalizing
+ * (and optionally case-folding) both strings entirely,
+ * improving performance significantly.
+ *
+ * Bulk normalization is only necessary if the strings do not fulfill the
+ * FCD conditions. Only in this case, and only if the strings are relatively
+ * long, is memory allocated temporarily.
+ * For FCD strings and short non-FCD strings there is no memory allocation.
+ *
+ * Semantically, this is equivalent to
+ * strcmp[CodePointOrder](foldCase(NFD(s1)), foldCase(NFD(s2)))
+ * where code point order and foldCase are all optional.
+ *
+ * @param s1 First source string.
+ * @param s2 Second source string.
+ *
+ * @param options A bit set of options:
+ * - FOLD_CASE_DEFAULT or 0 is used for default options:
+ * Case-sensitive comparison in code unit order, and the input strings
+ * are quick-checked for FCD.
+ *
+ * - INPUT_IS_FCD
+ * Set if the caller knows that both s1 and s2 fulfill the FCD
+ * conditions. If not set, the function will quickCheck for FCD
+ * and normalize if necessary.
+ *
+ * - COMPARE_CODE_POINT_ORDER
+ * Set to choose code point order instead of code unit order
+ *
+ * - COMPARE_IGNORE_CASE
+ * Set to compare strings case-insensitively using case folding,
+ * instead of case-sensitively.
+ * If set, then the following case folding options are used.
+ *
+ * @return <0 or 0 or >0 as usual for string comparisons
+ *
+ * @stable ICU 2.8
+ */
+--
+
+# Removal of reference to method that is not exposed in Android API
+--method:android.icu.text.Collator#getCollationKey(String)
+/**
+ * <p>
+ * Transforms the String into a CollationKey suitable for efficient
+ * repeated comparison. The resulting key depends on the collator's
+ * rules, strength and decomposition mode.
+ *
+ * <p>Note that collation keys are often less efficient than simply doing comparison.
+ * For more details, see the ICU User Guide.
+ *
+ * <p>See the CollationKey class documentation for more information.
+ * @param source the string to be transformed into a CollationKey.
+ * @return the CollationKey for the given String based on this Collator's
+ * collation rules. If the source String is null, a null
+ * CollationKey is returned.
+ * @see CollationKey
+ * @see #compare(String, String)
+ * @stable ICU 2.8
+ */
+--
+
+# Removal of reference to method that is not exposed in Android API
+--method:android.icu.text.RuleBasedCollator#getCollationKey(String)
+/**
+ * <p>
+ * Get a Collation key for the argument String source from this RuleBasedCollator.
+ * <p>
+ * General recommendation: <br>
+ * If comparison are to be done to the same String multiple times, it would be more efficient to generate
+ * CollationKeys for the Strings and use CollationKey.compareTo(CollationKey) for the comparisons. If the each
+ * Strings are compared to only once, using the method RuleBasedCollator.compare(String, String) will have a better
+ * performance.
+ * <p>
+ * See the class documentation for an explanation about CollationKeys.
+ *
+ * @param source
+ * the text String to be transformed into a collation key.
+ * @return the CollationKey for the given String based on this RuleBasedCollator's collation rules. If the source
+ * String is null, a null CollationKey is returned.
+ * @see CollationKey
+ * @see #compare(String, String)
+ * @stable ICU 2.8
+ */
+--
+
+# Removal of reference to method that is not exposed in Android API
+--method:android.icu.util.Calendar#isWeekend(Date)
+/**
+ * {@icu} Returns true if the given date and time is in the weekend in this calendar
+ * system. Equivalent to calling setTime() followed by isWeekend(). Note: This
+ * method changes the time this calendar is set to.
+ * @param date the date and time
+ * @return true if the given date and time is part of the
+ * weekend
+ * @see #isWeekend()
+ * @stable ICU 2.0
+ */
+--
+
+# Removal of reference to method that is not exposed in Android API
+--method:android.icu.util.Calendar#isWeekend()
+/**
+ * {@icu} Returns true if this Calendar's current date and time is in the weekend in
+ * this calendar system.
+ * @return true if the given date and time is part of the
+ * weekend
+ * @see #isWeekend(Date)
+ * @stable ICU 2.0
+ */
+--
