summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Roubert <roubert@google.com>2018-07-17 19:07:09 +0200
committerFredrik Roubert <roubert@google.com>2018-07-17 19:19:46 +0200
commit1a6c91e9ab221725ba1cbebb0449d3c2db758114 (patch)
treee06cdc450195515b48ce9d3dfb6f34466bcc854b
parentd8f0985f193495a0e8297c9cfdd82cdfaeaed32b (diff)
downloadicu-1a6c91e9ab221725ba1cbebb0449d3c2db758114.tar.gz
Rebuilt android_icu4j after reverting hiding of new API from ICU 62.android-n-iot-release-smart-display-r2
Bug: 109930825 Test: make update-api Change-Id: Ie02f8054edf9a3ac39e9523ba1ec34836c5eca8d
-rw-r--r--android_icu4j/src/main/java/android/icu/lang/UCharacter.java50
-rw-r--r--android_icu4j/src/main/java/android/icu/lang/UProperty.java2
-rw-r--r--android_icu4j/src/main/java/android/icu/lang/UScript.java13
-rw-r--r--android_icu4j/src/main/java/android/icu/util/VersionInfo.java1
4 files changed, 31 insertions, 35 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 dc5b58165..522978883 100644
--- a/android_icu4j/src/main/java/android/icu/lang/UCharacter.java
+++ b/android_icu4j/src/main/java/android/icu/lang/UCharacter.java
@@ -988,27 +988,27 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
// New blocks in Unicode 11.0
- /** @hide unsupported on Android*/
+ /***/
public static final int CHESS_SYMBOLS_ID = 281; /*[1FA00]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int DOGRA_ID = 282; /*[11800]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int GEORGIAN_EXTENDED_ID = 283; /*[1C90]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int GUNJALA_GONDI_ID = 284; /*[11D60]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int HANIFI_ROHINGYA_ID = 285; /*[10D00]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int INDIC_SIYAQ_NUMBERS_ID = 286; /*[1EC70]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int MAKASAR_ID = 287; /*[11EE0]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int MAYAN_NUMERALS_ID = 288; /*[1D2E0]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int MEDEFAIDRIN_ID = 289; /*[16E40]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int OLD_SOGDIAN_ID = 290; /*[10F00]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int SOGDIAN_ID = 291; /*[10F30]*/
/**
@@ -2127,35 +2127,35 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
// New blocks in Unicode 11.0
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock CHESS_SYMBOLS =
new UnicodeBlock("CHESS_SYMBOLS", CHESS_SYMBOLS_ID); /*[1FA00]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock DOGRA = new UnicodeBlock("DOGRA", DOGRA_ID); /*[11800]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock GEORGIAN_EXTENDED =
new UnicodeBlock("GEORGIAN_EXTENDED", GEORGIAN_EXTENDED_ID); /*[1C90]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock GUNJALA_GONDI =
new UnicodeBlock("GUNJALA_GONDI", GUNJALA_GONDI_ID); /*[11D60]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock HANIFI_ROHINGYA =
new UnicodeBlock("HANIFI_ROHINGYA", HANIFI_ROHINGYA_ID); /*[10D00]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock INDIC_SIYAQ_NUMBERS =
new UnicodeBlock("INDIC_SIYAQ_NUMBERS", INDIC_SIYAQ_NUMBERS_ID); /*[1EC70]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock MAKASAR = new UnicodeBlock("MAKASAR", MAKASAR_ID); /*[11EE0]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock MAYAN_NUMERALS =
new UnicodeBlock("MAYAN_NUMERALS", MAYAN_NUMERALS_ID); /*[1D2E0]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock MEDEFAIDRIN =
new UnicodeBlock("MEDEFAIDRIN", MEDEFAIDRIN_ID); /*[16E40]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock OLD_SOGDIAN =
new UnicodeBlock("OLD_SOGDIAN", OLD_SOGDIAN_ID); /*[10F00]*/
- /** @hide unsupported on Android*/
+ /***/
public static final UnicodeBlock SOGDIAN = new UnicodeBlock("SOGDIAN", SOGDIAN_ID); /*[10F30]*/
/**
@@ -2695,9 +2695,9 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
/***/
public static final int MALAYALAM_TTA = 99;
- /** @hide unsupported on Android*/
+ /***/
public static final int HANIFI_ROHINGYA_KINNA_YA = 100;
- /** @hide unsupported on Android*/
+ /***/
public static final int HANIFI_ROHINGYA_PA = 101;
/**
@@ -2838,7 +2838,7 @@ public final class UCharacter implements ECharacterCategory, ECharacterDirection
public static final int GLUE_AFTER_ZWJ = 20; /*[GAZ]*/
/***/
public static final int ZWJ = 21; /*[ZWJ]*/
- /** @hide unsupported on Android*/
+ /***/
public static final int WSEGSPACE = 22; /*[WSEGSPACE]*/
/**
* One more than the highest normal WordBreak value.
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 9a965e7c8..7876a422e 100644
--- a/android_icu4j/src/main/java/android/icu/lang/UProperty.java
+++ b/android_icu4j/src/main/java/android/icu/lang/UProperty.java
@@ -490,8 +490,6 @@ public interface UProperty
/**
* Binary property Extended_Pictographic.
* See http://www.unicode.org/reports/tr51/#Emoji_Properties
- *
- * @hide unsupported on Android
*/
public static final int EXTENDED_PICTOGRAPHIC=64;
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 223901e86..64a8bad94 100644
--- a/android_icu4j/src/main/java/android/icu/lang/UScript.java
+++ b/android_icu4j/src/main/java/android/icu/lang/UScript.java
@@ -831,20 +831,19 @@ public final class UScript {
/**
* ISO 15924 script code
- * @hide unsupported on Android
*/
public static final int DOGRA = 178; /* Dogr */
- /** @hide unsupported on Android*/
+ /***/
public static final int GUNJALA_GONDI = 179; /* Gong */
- /** @hide unsupported on Android*/
+ /***/
public static final int MAKASAR = 180; /* Maka */
- /** @hide unsupported on Android*/
+ /***/
public static final int MEDEFAIDRIN = 181; /* Medf */
- /** @hide unsupported on Android*/
+ /***/
public static final int HANIFI_ROHINGYA = 182; /* Rohg */
- /** @hide unsupported on Android*/
+ /***/
public static final int SOGDIAN = 183; /* Sogd */
- /** @hide unsupported on Android*/
+ /***/
public static final int OLD_SOGDIAN = 184; /* Sogo */
/**
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 fb3cdf262..62efd2f2f 100644
--- a/android_icu4j/src/main/java/android/icu/util/VersionInfo.java
+++ b/android_icu4j/src/main/java/android/icu/util/VersionInfo.java
@@ -149,7 +149,6 @@ public final class VersionInfo implements Comparable<VersionInfo>
/**
* Unicode 11.0 version
- * @hide unsupported on Android
*/
public static final VersionInfo UNICODE_11_0;