Hide new public APIs introduced by ICU 60.

This is temporary to decouple the library update from the API update.

Bug: 68208236
Test: make
Test: make update-api
Change-Id: Iaf91b7b9ab8d8836e633856c790ea5c2079300ba

9 files changed, 71 insertions, 25 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 e8d5e86eb..176e969e7 100644
--- a/android_icu4j/src/main/java/android/icu/lang/UCharacter.java
+++ b/android_icu4j/src/main/java/android/icu/lang/UCharacter.java
@@ -971,19 +971,19 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
 
         // New blocks in Unicode 10.0
 
-        /***/
+        /** @hide unsupported on Android*/
         public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F_ID = 274; /*[2CEB0]*/
-        /***/
+        /** @hide unsupported on Android*/
         public static final int KANA_EXTENDED_A_ID = 275; /*[1B100]*/
-        /***/
+        /** @hide unsupported on Android*/
         public static final int MASARAM_GONDI_ID = 276; /*[11D00]*/
-        /***/
+        /** @hide unsupported on Android*/
         public static final int NUSHU_ID = 277; /*[1B170]*/
-        /***/
+        /** @hide unsupported on Android*/
         public static final int SOYOMBO_ID = 278; /*[11A50]*/
-        /***/
+        /** @hide unsupported on Android*/
         public static final int SYRIAC_SUPPLEMENT_ID = 279; /*[0860]*/
-        /***/
+        /** @hide unsupported on Android*/
         public static final int ZANABAZAR_SQUARE_ID = 280; /*[11A00]*/
 
         /**
@@ -2080,23 +2080,23 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
 
         // New blocks in Unicode 10.0
 
-        /***/
+        /** @hide unsupported on Android*/
         public static final UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F =
                 new UnicodeBlock("CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F", CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F_ID); /*[2CEB0]*/
-        /***/
+        /** @hide unsupported on Android*/
         public static final UnicodeBlock KANA_EXTENDED_A =
                 new UnicodeBlock("KANA_EXTENDED_A", KANA_EXTENDED_A_ID); /*[1B100]*/
-        /***/
+        /** @hide unsupported on Android*/
         public static final UnicodeBlock MASARAM_GONDI =
                 new UnicodeBlock("MASARAM_GONDI", MASARAM_GONDI_ID); /*[11D00]*/
-        /***/
+        /** @hide unsupported on Android*/
         public static final UnicodeBlock NUSHU = new UnicodeBlock("NUSHU", NUSHU_ID); /*[1B170]*/
-        /***/
+        /** @hide unsupported on Android*/
         public static final UnicodeBlock SOYOMBO = new UnicodeBlock("SOYOMBO", SOYOMBO_ID); /*[11A50]*/
-        /***/
+        /** @hide unsupported on Android*/
         public static final UnicodeBlock SYRIAC_SUPPLEMENT =
                 new UnicodeBlock("SYRIAC_SUPPLEMENT", SYRIAC_SUPPLEMENT_ID); /*[0860]*/
-        /***/
+        /** @hide unsupported on Android*/
         public static final UnicodeBlock ZANABAZAR_SQUARE =
                 new UnicodeBlock("ZANABAZAR_SQUARE", ZANABAZAR_SQUARE_ID); /*[11A00]*/
 
@@ -2614,27 +2614,27 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
         /***/
         public static final int AFRICAN_QAF = 88;
 
-        /***/
+        /** @hide unsupported on Android*/
         public static final int MALAYALAM_BHA = 89;
-        /***/
+        /** @hide unsupported on Android*/
         public static final int MALAYALAM_JA = 90;
-        /***/
+        /** @hide unsupported on Android*/
         public static final int MALAYALAM_LLA = 91;
-        /***/
+        /** @hide unsupported on Android*/
         public static final int MALAYALAM_LLLA = 92;
-        /***/
+        /** @hide unsupported on Android*/
         public static final int MALAYALAM_NGA = 93;
-        /***/
+        /** @hide unsupported on Android*/
         public static final int MALAYALAM_NNA = 94;
-        /***/
+        /** @hide unsupported on Android*/
         public static final int MALAYALAM_NNNA = 95;
-        /***/
+        /** @hide unsupported on Android*/
         public static final int MALAYALAM_NYA = 96;
-        /***/
+        /** @hide unsupported on Android*/
         public static final int MALAYALAM_RA = 97;
-        /***/
+        /** @hide unsupported on Android*/
         public static final int MALAYALAM_SSA = 98;
-        /***/
+        /** @hide unsupported on Android*/
         public static final int MALAYALAM_TTA = 99;
 
         /**
diff --git a/android_icu4j/src/main/java/android/icu/lang/UProperty.java b/android_icu4j/src/main/java/android/icu/lang/UProperty.java
index 55b195e89..96859fce7 100644
--- a/android_icu4j/src/main/java/android/icu/lang/UProperty.java
+++ b/android_icu4j/src/main/java/android/icu/lang/UProperty.java
@@ -457,34 +457,48 @@ public interface UProperty
     /**
      * Binary property Emoji.
      * See http://www.unicode.org/reports/tr51/#Emoji_Properties
+     *
+     * @hide unsupported on Android
      */
     public static final int EMOJI=57;
     /**
      * Binary property Emoji_Presentation.
      * See http://www.unicode.org/reports/tr51/#Emoji_Properties
+     *
+     * @hide unsupported on Android
      */
     public static final int EMOJI_PRESENTATION=58;
     /**
      * Binary property Emoji_Modifier.
      * See http://www.unicode.org/reports/tr51/#Emoji_Properties
+     *
+     * @hide unsupported on Android
      */
     public static final int EMOJI_MODIFIER=59;
     /**
      * Binary property Emoji_Modifier_Base.
      * See http://www.unicode.org/reports/tr51/#Emoji_Properties
+     *
+     * @hide unsupported on Android
      */
     public static final int EMOJI_MODIFIER_BASE=60;
     /**
      * Binary property Emoji_Component.
      * See http://www.unicode.org/reports/tr51/#Emoji_Properties
+     *
+     * @hide unsupported on Android
      */
     public static final int EMOJI_COMPONENT=61;
     /**
      * Binary property Regional_Indicator.
+     *
+     * @hide unsupported on Android
      */
     public static final int REGIONAL_INDICATOR=62;
     /**
      * Binary property Prepended_Concatenation_Mark.
+     *
+     * @hide unsupported on Android
      */
     public static final int PREPENDED_CONCATENATION_MARK=63;
 
diff --git a/android_icu4j/src/main/java/android/icu/lang/UScript.java b/android_icu4j/src/main/java/android/icu/lang/UScript.java
index 42a1094f0..86efa34fe 100644
--- a/android_icu4j/src/main/java/android/icu/lang/UScript.java
+++ b/android_icu4j/src/main/java/android/icu/lang/UScript.java
@@ -818,14 +818,17 @@ public final class UScript {
 
     /**
      * ISO 15924 script code
+     * @hide unsupported on Android
      */
     public static final int MASARAM_GONDI = 175; /* Gonm */
     /**
      * ISO 15924 script code
+     * @hide unsupported on Android
      */
     public static final int SOYOMBO = 176; /* Soyo */
     /**
      * ISO 15924 script code
+     * @hide unsupported on Android
      */
     public static final int ZANABAZAR_SQUARE = 177; /* Zanb */
 
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 85fd4569a..1b73173ff 100644
--- a/android_icu4j/src/main/java/android/icu/text/DecimalFormatSymbols.java
+++ b/android_icu4j/src/main/java/android/icu/text/DecimalFormatSymbols.java
@@ -250,6 +250,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
     * <strong>[icu]</strong> Returns the array of strings used as digits, in order from 0 through 9
     * @return The array of ten digit strings
     * @see #setDigitStrings(String[])
+    * @hide unsupported on Android
     */
     public String[] getDigitStrings() {
         return digitStrings.clone();
@@ -299,6 +300,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
     * @throws NullPointerException if the <code>digitStrings</code> is null.
     * @throws IllegalArgumentException if the length of the array is not 10.
     * @see #getDigitStrings()
+    * @hide unsupported on Android
     */
     public void setDigitStrings(String[] digitStrings) {
         if (digitStrings == null) {
@@ -399,6 +401,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * <strong>[icu]</strong> Returns the string used for grouping separator. Different for French, etc.
      * @return the grouping separator string
      * @see #setGroupingSeparatorString(String)
+     * @hide unsupported on Android
      */
     public String getGroupingSeparatorString() {
         return groupingSeparatorString;
@@ -414,6 +417,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @param groupingSeparatorString the grouping separator string
      * @throws NullPointerException if <code>groupingSeparatorString</code> is null.
      * @see #getGroupingSeparatorString()
+     * @hide unsupported on Android
      */
     public void setGroupingSeparatorString(String groupingSeparatorString) {
         if (groupingSeparatorString == null) {
@@ -449,6 +453,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * <strong>[icu]</strong> Returns the string used for decimal sign.
      * @return the decimal sign string
      * @see #setDecimalSeparatorString(String)
+     * @hide unsupported on Android
      */
     public String getDecimalSeparatorString() {
         return decimalSeparatorString;
@@ -464,6 +469,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @param decimalSeparatorString the decimal sign string
      * @throws NullPointerException if <code>decimalSeparatorString</code> is null.
      * @see #getDecimalSeparatorString()
+     * @hide unsupported on Android
      */
     public void setDecimalSeparatorString(String decimalSeparatorString) {
         if (decimalSeparatorString == null) {
@@ -499,6 +505,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * <strong>[icu]</strong> Returns the string used for permille sign.
      * @return the permille string
      * @see #setPerMillString(String)
+     * @hide unsupported on Android
      */
     public String getPerMillString() {
         return perMillString;
@@ -514,6 +521,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @param perMillString the permille string
      * @throws NullPointerException if <code>perMillString</code> is null.
      * @see #getPerMillString()
+     * @hide unsupported on Android
      */
     public void setPerMillString(String perMillString) {
         if (perMillString == null) {
@@ -549,6 +557,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * <strong>[icu]</strong> Returns the string used for percent sign.
      * @return the percent string
      * @see #setPercentString(String)
+     * @hide unsupported on Android
      */
     public String getPercentString() {
         return percentString;
@@ -564,6 +573,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @param percentString the percent string
      * @throws NullPointerException if <code>percentString</code> is null.
      * @see #getPercentString()
+     * @hide unsupported on Android
      */
     public void setPercentString(String percentString) {
         if (percentString == null) {
@@ -676,6 +686,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * <strong>[icu]</strong> Returns the string used to represent minus sign.
      * @return the minus sign string
      * @see #setMinusSignString(String)
+     * @hide unsupported on Android
      */
     public String getMinusSignString() {
         return minusString;
@@ -691,6 +702,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @param minusSignString the minus sign string
      * @throws NullPointerException if <code>minusSignString</code> is null.
      * @see #getGroupingSeparatorString()
+     * @hide unsupported on Android
      */
     public void setMinusSignString(String minusSignString) {
         if (minusSignString == null) {
@@ -733,6 +745,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
     /**
      * <strong>[icu]</strong> Returns the string used to represent plus sign.
      * @return the plus sign string
+     * @hide unsupported on Android
      */
     public String getPlusSignString() {
         return plusString;
@@ -749,6 +762,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * strings
      * @throws NullPointerException if <code>plusSignString</code> is null.
      * @see #getPlusSignString()
+     * @hide unsupported on Android
      */
     public void setPlusSignString(String plusSignString) {
         if (plusSignString == null) {
@@ -849,6 +863,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * <strong>[icu]</strong> Returns the monetary decimal separator string.
      * @return the monetary decimal separator string
      * @see #setMonetaryDecimalSeparatorString(String)
+     * @hide unsupported on Android
      */
     public String getMonetaryDecimalSeparatorString() {
         return monetarySeparatorString;
@@ -864,6 +879,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @param sep the monetary decimal separator string
      * @throws NullPointerException if <code>sep</code> is null.
      * @see #getMonetaryDecimalSeparatorString()
+     * @hide unsupported on Android
      */
     public void setMonetaryDecimalSeparatorString(String sep) {
         if (sep == null) {
@@ -899,6 +915,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * <strong>[icu]</strong> Returns the monetary grouping separator.
      * @return the monetary grouping separator string
      * @see #setMonetaryGroupingSeparatorString(String)
+     * @hide unsupported on Android
      */
     public String getMonetaryGroupingSeparatorString() {
         return monetaryGroupingSeparatorString;
@@ -914,6 +931,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
      * @param sep the monetary grouping separator string
      * @throws NullPointerException if <code>sep</code> is null.
      * @see #getMonetaryGroupingSeparatorString()
+     * @hide unsupported on Android
      */
     public void setMonetaryGroupingSeparatorString(String sep) {
         if (sep == null) {
diff --git a/android_icu4j/src/main/java/android/icu/text/DisplayContext.java b/android_icu4j/src/main/java/android/icu/text/DisplayContext.java
index 03cf7c4be..ce4fcd7fc 100644
--- a/android_icu4j/src/main/java/android/icu/text/DisplayContext.java
+++ b/android_icu4j/src/main/java/android/icu/text/DisplayContext.java
@@ -88,11 +88,13 @@ public enum DisplayContext {
      * A possible setting for SUBSTITUTE_HANDLING:
      * Returns a fallback value (e.g., the input code) when no data is available.
      * This is the default behavior.
+     * @hide unsupported on Android
      */
     SUBSTITUTE(Type.SUBSTITUTE_HANDLING, 0),
     /**
      * A possible setting for SUBSTITUTE_HANDLING:
      * Returns a null value when no data is available.
+     * @hide unsupported on Android
      */
     NO_SUBSTITUTE(Type.SUBSTITUTE_HANDLING, 1);
 
@@ -115,6 +117,7 @@ public enum DisplayContext {
         DISPLAY_LENGTH,
         /**
          * SUBSTITUTE_HANDLING can be set to SUBSTITUTE or NO_SUBSTITUTE.
+         * @hide unsupported on Android
          */
         SUBSTITUTE_HANDLING
     }
diff --git a/android_icu4j/src/main/java/android/icu/text/MeasureFormat.java b/android_icu4j/src/main/java/android/icu/text/MeasureFormat.java
index 4336995ed..85acbcdf8 100644
--- a/android_icu4j/src/main/java/android/icu/text/MeasureFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/MeasureFormat.java
@@ -556,6 +556,8 @@ public class MeasureFormat extends UFormat {
      * @return  The display name in the locale and width specified in
      *          {@link MeasureFormat#getInstance}, or null if there is no display name available
      *          for the specified unit.
+     *
+     * @hide unsupported on Android
      */
     public String getUnitDisplayName(MeasureUnit unit) {
         FormatWidth width = getRegularWidth(formatWidth);
diff --git a/android_icu4j/src/main/java/android/icu/util/MeasureUnit.java b/android_icu4j/src/main/java/android/icu/util/MeasureUnit.java
index afeb14aa4..fba613b26 100644
--- a/android_icu4j/src/main/java/android/icu/util/MeasureUnit.java
+++ b/android_icu4j/src/main/java/android/icu/util/MeasureUnit.java
@@ -456,11 +456,13 @@ public class MeasureUnit implements Serializable {
 
     /**
      * Constant for unit of concentr: millimole-per-liter
+     * @hide unsupported on Android
      */
     public static final MeasureUnit MILLIMOLE_PER_LITER = MeasureUnit.internalGetInstance("concentr", "millimole-per-liter");
 
     /**
      * Constant for unit of concentr: part-per-million
+     * @hide unsupported on Android
      */
     public static final MeasureUnit PART_PER_MILLION = MeasureUnit.internalGetInstance("concentr", "part-per-million");
 
diff --git a/android_icu4j/src/main/java/android/icu/util/TimeZone.java b/android_icu4j/src/main/java/android/icu/util/TimeZone.java
index 4d3315b5e..1a697107f 100644
--- a/android_icu4j/src/main/java/android/icu/util/TimeZone.java
+++ b/android_icu4j/src/main/java/android/icu/util/TimeZone.java
@@ -221,16 +221,19 @@ abstract public class TimeZone implements Serializable, Cloneable, Freezable<Tim
     public enum SystemTimeZoneType {
         /**
          * Any system zones.
+         * @hide unsupported on Android
          */
         ANY,
 
         /**
          * Canonical system zones.
+         * @hide unsupported on Android
          */
         CANONICAL,
 
         /**
          * Canonical system zones associated with actual locations.
+         * @hide unsupported on Android
          */
         CANONICAL_LOCATION,
     }
diff --git a/android_icu4j/src/main/java/android/icu/util/VersionInfo.java b/android_icu4j/src/main/java/android/icu/util/VersionInfo.java
index 9698bf9c1..a80834c24 100644
--- a/android_icu4j/src/main/java/android/icu/util/VersionInfo.java
+++ b/android_icu4j/src/main/java/android/icu/util/VersionInfo.java
@@ -144,6 +144,7 @@ public final class VersionInfo implements Comparable<VersionInfo>
 
     /**
      * Unicode 10.0 version
+     * @hide unsupported on Android
      */
     public static final VersionInfo UNICODE_10_0;