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

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

Merge "Declare a public field for new Japanese Era Reiwa" am: 857636e0 am: 191127c5 

Change-Id: I2a504ebd0cbc42567daed02dd8a2ce4f43461d38
parents a61f378b 191127c5

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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;

  }

api/lint-baseline.txt

+3 −0
Original line number Diff line number Diff line
@@ -538,6 +538,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):