diff options
author | Nikita Iashchenko <nikitai@google.com> | 2019-03-19 18:24:33 +0000 |
---|---|---|
committer | Nikita Iashchenko <nikitai@google.com> | 2019-04-25 13:32:03 +0100 |
commit | 486785759c587cd50f8a70ef2613cf96f76dee29 (patch) | |
tree | 398c2f501da45dc65a6c530ba1127f0c74ab2cba /annotations/generate_annotated_java_files.py | |
parent | 75177c81b67201ebbb7739a74fad708a1c46b3dc (diff) |
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: 77858319
Test: CtsLibcoreTestCases
Test: CtsLibcoreOjTestCases
Change-Id: I74b05bcbd39c5caec48c0de13e784127044b19ff
Merged-In: I74b05bcbd39c5caec48c0de13e784127044b19ff
(cherry picked from commit 02d0583d4fd19521116fa2d17a71340d97abeb74)
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions