diff options
| author | Nikita Iashchenko <nikitai@google.com> | 2019-03-19 18:24:33 +0000 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2019-05-14 17:52:22 +0100 |
| commit | 29e038e96ab5e680502541f6e3daaae6ef6b9edf (patch) | |
| tree | 8f90c75721a3d81a7a67a7b68a2bbdb5b58726f2 /annotations/generate_annotated_java_files.py | |
| parent | fc7b371715bc4075275e5b2be5b1a46c789baee3 (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: 131153101
Test: CtsLibcoreTestCases
Test: CtsLibcoreOjTestCases
Change-Id: I74b05bcbd39c5caec48c0de13e784127044b19ff
Merged-In: I74b05bcbd39c5caec48c0de13e784127044b19ff
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions