Update android_icu4j javadoc patches
This CL updates some javadoc patches that were not updated since a
couple of last releases because they don't carry any significant
changes except slightly moving lines up and down thanks to ICU version
bumps.
Test: treehugger
Change-Id: I2babeb04b10f815fd04577d942383032671ba744
diff --git a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/DateTimePatternGenerator.java.patch b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/DateTimePatternGenerator.java.patch
index 63a0093..908f9fe 100644
--- a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/DateTimePatternGenerator.java.patch
+++ b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/DateTimePatternGenerator.java.patch
@@ -1,6 +1,6 @@
---- android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java 2018-10-22 05:12:26.868613656 +0100
-+++ android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java 2018-10-22 05:12:45.536675367 +0100
-@@ -1230,7 +1230,6 @@
+--- android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java 2019-09-13 12:40:41.561486684 +0100
++++ android_icu4j/src/main/java/android/icu/text/DateTimePatternGenerator.java 2019-09-13 12:41:03.217566569 +0100
+@@ -1235,7 +1235,6 @@
*
* @param field The index to get the append item name.
* @return name for field
diff --git a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/MeasureFormat.java.patch b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/MeasureFormat.java.patch
index bc5a099..35f16e5 100644
--- a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/MeasureFormat.java.patch
+++ b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/MeasureFormat.java.patch
@@ -1,6 +1,6 @@
---- android_icu4j/src/main/java/android/icu/text/MeasureFormat.java 2018-08-21 18:04:14.282638002 +0100
-+++ android_icu4j/src/main/java/android/icu/text/MeasureFormat.java 2018-08-21 18:02:29.502129978 +0100
-@@ -57,12 +57,6 @@
+--- android_icu4j/src/main/java/android/icu/text/MeasureFormat.java 2019-09-13 12:40:40.773483778 +0100
++++ android_icu4j/src/main/java/android/icu/text/MeasureFormat.java 2019-09-13 12:41:03.369567130 +0100
+@@ -58,12 +58,6 @@
* A formatter for Measure objects.
*
* <p>
diff --git a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/Normalizer.java.patch b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/Normalizer.java.patch
index f09bd66..606e3c1 100644
--- a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/Normalizer.java.patch
+++ b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/text/Normalizer.java.patch
@@ -1,6 +1,6 @@
---- android_icu4j/src/main/java/android/icu/text/Normalizer.java 2018-10-22 05:12:28.404618733 +0100
-+++ android_icu4j/src/main/java/android/icu/text/Normalizer.java 2018-10-22 05:12:45.696675895 +0100
-@@ -1178,9 +1178,6 @@
+--- android_icu4j/src/main/java/android/icu/text/Normalizer.java 2019-09-13 12:40:38.801476503 +0100
++++ android_icu4j/src/main/java/android/icu/text/Normalizer.java 2019-09-13 12:41:03.445567410 +0100
+@@ -1185,9 +1185,6 @@
*
*
* @return <0 or 0 or >0 as usual for string comparisons
@@ -10,7 +10,7 @@
*/
public static int compare(char[] s1, int s1Start, int s1Limit,
char[] s2, int s2Start, int s2Limit,
-@@ -1238,9 +1235,6 @@
+@@ -1245,9 +1242,6 @@
* If set, then the following case folding options are used.
*
* @return <0 or 0 or >0 as usual for string comparisons
@@ -20,7 +20,7 @@
*/
public static int compare(String s1, String s2, int options) {
return internalCompare(s1, s2, options);
-@@ -1274,9 +1268,6 @@
+@@ -1281,9 +1275,6 @@
* If set, then the following case folding options are used.
*
* @return <0 or 0 or >0 as usual for string comparisons
diff --git a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/Calendar.java.patch b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/Calendar.java.patch
index f1debe7..3dc1ebb 100644
--- a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/Calendar.java.patch
+++ b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/Calendar.java.patch
@@ -1,6 +1,6 @@
---- android_icu4j/src/main/java/android/icu/util/Calendar.java 2018-10-22 05:12:22.756600061 +0100
-+++ android_icu4j/src/main/java/android/icu/util/Calendar.java 2018-10-22 05:12:45.832676346 +0100
-@@ -4476,8 +4476,6 @@
+--- android_icu4j/src/main/java/android/icu/util/Calendar.java 2019-09-13 12:40:42.633490639 +0100
++++ android_icu4j/src/main/java/android/icu/util/Calendar.java 2019-09-13 12:41:03.625568074 +0100
+@@ -4477,8 +4477,6 @@
* @param date the date and time
* @return true if the given date and time is part of the
* weekend
@@ -9,7 +9,7 @@
* @see #isWeekend()
*/
public boolean isWeekend(Date date) {
-@@ -4490,8 +4488,6 @@
+@@ -4491,8 +4489,6 @@
* this calendar system.
* @return true if the given date and time is part of the
* weekend
diff --git a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/TimeZone.java.patch b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/TimeZone.java.patch
index e8bf3ff..b26cea2 100644
--- a/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/TimeZone.java.patch
+++ b/tools/srcgen/javadoc_patches/patches/src/main/java/android/icu/util/TimeZone.java.patch
@@ -1,6 +1,6 @@
---- android_icu4j/src/main/java/android/icu/util/TimeZone.java 2017-08-25 08:53:44.093865959 +0100
-+++ android_icu4j/src/main/java/android/icu/util/TimeZone.java 2017-08-25 08:54:12.489921270 +0100
-@@ -83,32 +83,6 @@
+--- android_icu4j/src/main/java/android/icu/util/TimeZone.java 2019-09-13 12:40:44.041495833 +0100
++++ android_icu4j/src/main/java/android/icu/util/TimeZone.java 2019-09-13 12:41:03.733568473 +0100
+@@ -83,35 +83,8 @@
* Time" and "China Standard Time"), and the Java platform can then only
* recognize one of them.
*
@@ -32,8 +32,11 @@
- *
* @see Calendar
* @see GregorianCalendar
- * @see SimpleTimeZone
-@@ -147,14 +121,12 @@
+- * @see SimpleTimeZone
+ * @author Mark Davis, Deborah Goldsmith, Chen-Lieh Huang, Alan Liu
+ */
+ abstract public class TimeZone implements Serializable, Cloneable, Freezable<TimeZone> {
+@@ -147,14 +120,12 @@
/**
* <strong>[icu]</strong> A time zone implementation type indicating ICU's own TimeZone used by
@@ -50,13 +53,3 @@
*/
public static final int TIMEZONE_JDK = 1;
---- android_icu4j/src/main/java/android/icu/util/TimeZone.java 2018-06-13 19:00:05.852112712 +0100
-+++ android_icu4j/src/main/java/android/icu/util/TimeZone.java 2018-06-13 18:58:54.540407828 +0100
-@@ -85,7 +85,6 @@
- *
- * @see Calendar
- * @see GregorianCalendar
-- * @see SimpleTimeZone
- * @author Mark Davis, Deborah Goldsmith, Chen-Lieh Huang, Alan Liu
- */
- abstract public class TimeZone implements Serializable, Cloneable, Freezable<TimeZone> {