| commit | fd747a04ea66c7ccb44979004ea7fbf3b14bae0a | [log] [tgz] |
|---|---|---|
| author | Nikita Iashchenko <nikitai@google.com> | Tue Mar 19 18:24:33 2019 +0000 |
| committer | Victor Chang <vichang@google.com> | Tue May 07 14:19:57 2019 +0100 |
| tree | 8e1e798337c5f9f731979a568cbcb7cd122ded92 | |
| parent | 2b93f7f9da6dc2d4a82e9dcdf549d1c76873961a [diff] |
DO NOT MERGE New Japanese Era implementation in ojluni with a placeholder name This integrates all upstream changes up to OpenJDK 8u212-b01 It consists the following commits from upstream - 8202088: Japanese new era implementation http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/bc0a3a91a074 - 8212941: Support new Japanese era in java.time.chrono.JapaneseEra http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/c35f231af17a - 8171049: Era.getDisplayName doesn't work with non-IsoChronology http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/3cb43f3afe1c - 8177678: Overstatement of universality of Era.getDisplayName() implementation http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/49bcab3213c1 - 8054214: JapaneseEra.getDisplayName doesn't return names if it's an additional era http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/0d9af9ca16e2 new Android-changed: - JapaneseImperialCalendar.currentEra is changed to be hard-coded because Zygote could initialize currentEra with incorrect system time. - TestNonIsoFormatter#test_lenientEraYear is updated to use CLDR data Bug: 131312444 Test: CtsLibcoreTestCases Test: CtsLibcoreOjTestCases Change-Id: I74b05bcbd39c5caec48c0de13e784127044b19ff Merged-In: I74b05bcbd39c5caec48c0de13e784127044b19ff (cherry picked from commit 02d0583d4fd19521116fa2d17a71340d97abeb74)