Snap for 6454413 from 9e192bc41d3123e78f008f93b0cf3eb13b5cbe78 to rvc-d1-release

Change-Id: I119188d8b3806c0fd5d4a7636f3f9a64b3b71123

4 files changed, 27 insertions, 8 deletions

diff --git a/android_icu4j/src/main/java/android/icu/lang/UCharacter.java b/android_icu4j/src/main/java/android/icu/lang/UCharacter.java
index 997635160..7706939e4 100644
--- a/android_icu4j/src/main/java/android/icu/lang/UCharacter.java
+++ b/android_icu4j/src/main/java/android/icu/lang/UCharacter.java
@@ -5194,7 +5194,6 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
      *         Unicode version does not have data for the property at all, or
      *         not for this code point.
      * @see android.icu.lang.UProperty
-     * @see CharacterProperties#getBinaryPropertySet(int)
      */
     public static boolean hasBinaryProperty(int ch, int property)
     {
@@ -5283,7 +5282,6 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
      * @see #hasBinaryProperty
      * @see #getIntPropertyMinValue
      * @see #getIntPropertyMaxValue
-     * @see CharacterProperties#getIntPropertyMap(int)
      * @see #getUnicodeVersion
      */
     public static int getIntPropertyValue(int ch, int type)
diff --git a/android_icu4j/src/main/java/android/icu/number/NumberFormatterSettings.java b/android_icu4j/src/main/java/android/icu/number/NumberFormatterSettings.java
index 1f7d26766..99ddf9ef9 100644
--- a/android_icu4j/src/main/java/android/icu/number/NumberFormatterSettings.java
+++ b/android_icu4j/src/main/java/android/icu/number/NumberFormatterSettings.java
@@ -134,7 +134,6 @@ public abstract class NumberFormatterSettings<T extends NumberFormatterSettings<
      * @return The fluent chain.
      * @see MeasureUnit
      * @see Currency
-     * @see NoUnit
      * @see #perUnit
      */
     public T unit(MeasureUnit unit) {
diff --git a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/lang/UCharacter.java.patch b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/lang/UCharacter.java.patch
index bf651b6fb..d7d9b7ba7 100644
--- a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/lang/UCharacter.java.patch
+++ b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/lang/UCharacter.java.patch
@@ -1,5 +1,5 @@
---- android_icu4j/src/main/java/android/icu/lang/UCharacter.java	2017-10-13 00:22:56.775382358 -0700
-+++ android_icu4j/src/main/java/android/icu/lang/UCharacter.java	2017-10-13 00:23:10.887535857 -0700
+--- android_icu4j/src/main/java/android/icu/lang/UCharacter.java	2020-04-30 14:29:35.324601232 +0100
++++ android_icu4j/src/main/java/android/icu/lang/UCharacter.java	2020-04-30 14:30:04.016811269 +0100
 @@ -53,16 +53,6 @@
   * more convenient in Java to have a separate primitive datatype for them,
   * ints suffice in the meantime.
@@ -29,3 +29,19 @@
   * In addition to Java compatibility functions, which calculate derived properties,
   * this API provides low-level access to the Unicode Character Database.
   * <p>
+@@ -5209,7 +5194,6 @@
+      *         Unicode version does not have data for the property at all, or
+      *         not for this code point.
+      * @see android.icu.lang.UProperty
+-     * @see CharacterProperties#getBinaryPropertySet(int)
+      */
+     public static boolean hasBinaryProperty(int ch, int property)
+     {
+@@ -5298,7 +5282,6 @@
+      * @see #hasBinaryProperty
+      * @see #getIntPropertyMinValue
+      * @see #getIntPropertyMaxValue
+-     * @see CharacterProperties#getIntPropertyMap(int)
+      * @see #getUnicodeVersion
+      */
+     public static int getIntPropertyValue(int ch, int type)
diff --git a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/number/NumberFormatterSettings.java.patch b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/number/NumberFormatterSettings.java.patch
index 2a4a88e41..6d2b0d8bf 100644
--- a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/number/NumberFormatterSettings.java.patch
+++ b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/number/NumberFormatterSettings.java.patch
@@ -1,6 +1,6 @@
---- android_icu4j/src/main/java/android/icu/number/NumberFormatterSettings.java	2019-12-20 13:19:52.721019722 +0000
-+++ android_icu4j/src/main/java/android/icu/number/NumberFormatterSettings.java	2019-12-20 13:19:51.069006835 +0000
-@@ -129,9 +129,6 @@
+--- android_icu4j/src/main/java/android/icu/number/NumberFormatterSettings.java	2020-04-30 14:29:38.736626213 +0100
++++ android_icu4j/src/main/java/android/icu/number/NumberFormatterSettings.java	2020-04-30 14:30:04.056811563 +0100
+@@ -129,15 +129,11 @@
       * <p>
       * See {@link #perUnit} for information on how to format strings like "5 meters per second".
       *
@@ -10,3 +10,9 @@
       * @param unit
       *            The unit to render.
       * @return The fluent chain.
+      * @see MeasureUnit
+      * @see Currency
+-     * @see NoUnit
+      * @see #perUnit
+      */
+     public T unit(MeasureUnit unit) {