Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Declare a public field for new Japanese Era Reiwa" am: 857636e059 am: 191127c556

Browse Source 
Change-Id: I2a504ebd0cbc42567daed02dd8a2ce4f43461d38
This commit is contained in:
Automerger Merge Worker
2020-02-19 01:53:12 +00:00
parent a61f378be4 191127c556
commit b79f0c4c12
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -69786,6 +69786,7 @@ package java.time.chrono {
method public static java.time.chrono.JapaneseEra[] values();
field public static final java.time.chrono.JapaneseEra HEISEI;
field public static final java.time.chrono.JapaneseEra MEIJI;
field public static final java.time.chrono.JapaneseEra REIWA;
field public static final java.time.chrono.JapaneseEra SHOWA;
field public static final java.time.chrono.JapaneseEra TAISHO;
}

3
api/lint-baseline.txt
View File

@@ -537,6 +537,9 @@ 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`
MissingNullability: java.time.chrono.JapaneseEra#REIWA:
Missing nullability on field `REIWA` in class `class java.time.chrono.JapaneseEra`
RequiresPermission: android.accounts.AccountManager#getAccountsByTypeAndFeatures(String, String[], android.accounts.AccountManagerCallback<android.accounts.Account[]>, android.os.Handler):