From 73d22d5abc96160a4c87f2b206113fcd1c735bf8 Mon Sep 17 00:00:00 2001 From: Nikita Iashchenko Date: Mon, 17 Feb 2020 18:23:01 +0000 Subject: [PATCH] Declare a public field for new Japanese Era Reiwa Integrate OpenJDK commit for new Japanese Era name: * 8174268: Declare a public field in JapaneseEra for the era starting May 2019 http://hg.openjdk.java.net/jdk/jdk/rev/6a4abdb6749c Bug: 149437171 Test: CtsLibcoreTestCases CtsLibcoreOjTestCases Merged-In: I1cbc9a12744d3cea214ee3b4a2872a9ad144e147 Change-Id: I1cbc9a12744d3cea214ee3b4a2872a9ad144e147 --- api/current.txt | 1 + api/lint-baseline.txt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/api/current.txt b/api/current.txt index 80a7bb49b1e00..0f56af0b49e8a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -69783,6 +69783,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; } diff --git a/api/lint-baseline.txt b/api/lint-baseline.txt index 5c31f41e2e3c9..b14a12f62e34c 100644 --- a/api/lint-baseline.txt +++ b/api/lint-baseline.txt @@ -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.os.Handler):