From f9258ccc07d12cf294870f78ddee98e4310753f0 Mon Sep 17 00:00:00 2001 From: Nikita Iashchenko Date: Mon, 17 Feb 2020 18:23:01 +0000 Subject: 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 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 23637eb5c407..c96c85bfac0a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -72122,6 +72122,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 2a8f04fe54b6..569e838ea177 100644 --- a/api/lint-baseline.txt +++ b/api/lint-baseline.txt @@ -561,6 +561,9 @@ MissingNullability: android.media.MediaMetadataRetriever#getFrameAtTime(long, in MissingNullability: android.media.MediaMetadataRetriever#getScaledFrameAtTime(long, int, int, int, android.media.MediaMetadataRetriever.BitmapParams): + +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): -- cgit v1.2.3-59-g8ed1b