Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7a11b60 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Expose four ICU fields from version 66.0.1" am: 3f408e57 am: 2b4c11c3 

Change-Id: If45617cc60e8e286100a0c5ff6c4298d83a7c0f0
parents 6079e88f 2b4c11c3

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -18291,6 +18291,7 @@ package android.icu.lang { 
    field public static final int CHEROKEE_SUPPLEMENT_ID = 255; // 0xff

    field public static final android.icu.lang.UCharacter.UnicodeBlock CHESS_SYMBOLS;

    field public static final int CHESS_SYMBOLS_ID = 281; // 0x119

    field public static final android.icu.lang.UCharacter.UnicodeBlock CHORASMIAN;

    field public static final int CHORASMIAN_ID = 301; // 0x12d

    field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY;

    field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_COMPATIBILITY_FORMS;
@@ -18319,6 +18320,7 @@ package android.icu.lang { 
    field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E_ID = 256; // 0x100

    field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F;

    field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F_ID = 274; // 0x112

    field public static final android.icu.lang.UCharacter.UnicodeBlock CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G;

    field public static final int CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G_ID = 302; // 0x12e

    field public static final int CJK_UNIFIED_IDEOGRAPHS_ID = 71; // 0x47

    field public static final android.icu.lang.UCharacter.UnicodeBlock COMBINING_DIACRITICAL_MARKS;
@@ -18369,6 +18371,7 @@ package android.icu.lang { 
    field public static final int DEVANAGARI_ID = 15; // 0xf

    field public static final android.icu.lang.UCharacter.UnicodeBlock DINGBATS;

    field public static final int DINGBATS_ID = 56; // 0x38

    field public static final android.icu.lang.UCharacter.UnicodeBlock DIVES_AKURU;

    field public static final int DIVES_AKURU_ID = 303; // 0x12f

    field public static final android.icu.lang.UCharacter.UnicodeBlock DOGRA;

    field public static final int DOGRA_ID = 282; // 0x11a
@@ -22541,6 +22544,7 @@ package android.icu.util { 
    field public static final android.icu.util.VersionInfo UNICODE_11_0;

    field public static final android.icu.util.VersionInfo UNICODE_12_0;

    field public static final android.icu.util.VersionInfo UNICODE_12_1;

    field public static final android.icu.util.VersionInfo UNICODE_13_0;

    field public static final android.icu.util.VersionInfo UNICODE_1_0;

    field public static final android.icu.util.VersionInfo UNICODE_1_0_1;

    field public static final android.icu.util.VersionInfo UNICODE_1_1_0;

api/lint-baseline.txt

+8 −0
Original line number Diff line number Diff line
@@ -485,6 +485,12 @@ HiddenSuperclass: android.util.StatsLog: 
    





MissingNullability: android.icu.lang.UCharacter.UnicodeBlock#CHORASMIAN:

    Missing nullability on field `CHORASMIAN` in class `class android.icu.lang.UCharacter.UnicodeBlock`

MissingNullability: android.icu.lang.UCharacter.UnicodeBlock#CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G:

    Missing nullability on field `CJK_UNIFIED_IDEOGRAPHS_EXTENSION_G` in class `class android.icu.lang.UCharacter.UnicodeBlock`

MissingNullability: android.icu.lang.UCharacter.UnicodeBlock#DIVES_AKURU:

    Missing nullability on field `DIVES_AKURU` in class `class android.icu.lang.UCharacter.UnicodeBlock`

MissingNullability: android.icu.lang.UCharacter.UnicodeBlock#EGYPTIAN_HIEROGLYPH_FORMAT_CONTROLS:

    

MissingNullability: android.icu.lang.UCharacter.UnicodeBlock#ELYMAIC:
@@ -529,6 +535,8 @@ MissingNullability: android.icu.util.VersionInfo#UNICODE_12_0: 
    

MissingNullability: android.icu.util.VersionInfo#UNICODE_12_1:

    

MissingNullability: android.icu.util.VersionInfo#UNICODE_13_0:

    Missing nullability on field `UNICODE_13_0` in class `class android.icu.util.VersionInfo`





RequiresPermission: android.accounts.AccountManager#getAccountsByTypeAndFeatures(String, String[], android.accounts.AccountManagerCallback<android.accounts.Account[]>, android.os.Handler):