| commit | 9831887bfad7900944c78bea3e457d33dd4aed72 | [log] [tgz] |
|---|---|---|
| author | Nikita Iashchenko <nikitai@google.com> | Tue Mar 19 18:24:33 2019 +0000 |
| committer | Victor Chang <vichang@google.com> | Tue May 14 20:14:06 2019 +0100 |
| tree | 908064b986c010c0521900175f3064659b2f133b | |
| parent | fed6186c743607d4c2696cc27385a31567f63185 [diff] |
DO NOT MERGE New Japanese Era test changes in ojluni with a placeholder name This integrates all upstream TEST 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: 132197588 Test: CtsLibcoreTestCases Test: CtsLibcoreOjTestCases Change-Id: I74b05bcbd39c5caec48c0de13e784127044b19ff Merged-In: I74b05bcbd39c5caec48c0de13e784127044b19ff