summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-04Snap for 7965683 from 4c528f76388a7868498e1913deea16191831f6c6 to ↵pie-vts-releaseAndroid Build Coastguard Worker
pie-vts-release Change-Id: I737b52004775e97604efa7ccdcc3be70ff5c0c00
2021-12-02[automerger skipped] DO NOT MERGE Track tzdb 2021a3 updates. [O-MR1-CTS] am: ↵Almaz Mingaleev
98bd5fce31 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/1903515 Change-Id: I5babf9ff1a23468b55783e299a5e8d8e24690673
2021-11-26DO NOT MERGE Track tzdb 2021a3 update. [P-CTS]Almaz Mingaleev
This CL updates tests related to 2021a1 and 2021a3 TZDB release. ICU's tzdata 2021a3 changes canonicalisation rules for some time zones. This CL updates tests assosiated with these changes with one minor change: Android skipped change which makes America/Panama canonical representation of America/Coral_Harbour. Only test changes are kept, binary and txt files left as they were. Bug: 205971225 Bug: 207805859 Test: see system/timezone CL Change-Id: I9442dfc4e08cd9dc55b5afe5ed5e4d9336dadfa5 Merged-In: I9442dfc4e08cd9dc55b5afe5ed5e4d9336dadfa5 Merged-In: I0d2b0b1a64a59721f845a63500801abfd96daca3
2021-11-26DO NOT MERGE Track tzdb 2021a3 updates. [O-MR1-CTS]Almaz Mingaleev
This CL updates tests related to 2021a1 and 2021a3 TZDB release. ICU's tzdata 2021a3 changes canonicalisation rules for some time zones. This CL updates tests assosiated with these changes with one minor change: Android skipped change which makes America/Panama canonical representation of America/Coral_Harbour. Only test changes are kept, binary and txt files left as they were. Bug: 207111172 Bug: 207805859 Test: see system/timezone CL Change-Id: I9442dfc4e08cd9dc55b5afe5ed5e4d9336dadfa5 Merged-In: I9442dfc4e08cd9dc55b5afe5ed5e4d9336dadfa5 Merged-In: I0d2b0b1a64a59721f845a63500801abfd96daca3
2021-02-04Snap for 7120105 from ff2a1f4f452cc3fb59fe0bd3d2d779dba11efe74 to ↵android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-build-prod (mdb)
pie-vts-release Change-Id: Ic54a8feb24303f62bec962750bd4a844544892a1
2021-02-02[automerger skipped] DO NOT MERGE Cherry-pick ICU-21448: Update Android ICU ↵Almaz Mingaleev
tzdata from 2020d to 2020f. [O-MR1 CTS] am: 6ed6f556ba -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/1569381 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5bbdb8a0a8212aa9be848b109524b5eb701bb5b3
2021-02-02DO NOT MERGE Cherry-pick ICU-21448: Update Android ICU tzdata from 2020dAlmaz Mingaleev
to 2020f. [P CTS] Cherry-pick ICU-21448: Update Android ICU tzdata from 2020d to 2020f. [P CTS] This is a cherry pick of https://github.com/unicode-org/icu/commit/25eb1510ec4e536fe0d0d1024b3ce71819510d0a. New test cases in SimpleDateFormat.java and tzfmttst.cpp were skipped as they rely on prod code changes. See https://github.com/unicode-org/icu/pull/1526/files#r552372640 for more details. For CTS, code and data changes were skipped from original CL as goal is to fix failing TimeZoneTest on devices with 2020f update. See b/177644925 for partner reported waiver req. Bug: 177868678 Test: CtsIcuTestCases Merged-In: Ic537360ec304c72468f558d7a5093a54a60d654f Change-Id: Ic537360ec304c72468f558d7a5093a54a60d654f (cherry picked from commit 5f4df32641bdf69b1a66cca7ee1c1a895e63fd6f)
2021-02-02DO NOT MERGE Cherry-pick ICU-21448: Update Android ICU tzdata from 2020d to ↵Almaz Mingaleev
2020f. [O-MR1 CTS] Cherry-pick ICU-21448: Update Android ICU tzdata from 2020d to 2020f. [O-MR1 CTS] This is a cherry pick of https://github.com/unicode-org/icu/commit/25eb1510ec4e536fe0d0d1024b3ce71819510d0a. New test cases in SimpleDateFormat.java and tzfmttst.cpp were skipped as they rely on prod code changes. See https://github.com/unicode-org/icu/pull/1526/files#r552372640 for more details. For CTS, code and data changes were skipped from original CL as goal is to fix failing TimeZoneTest on devices with 2020f update. See b/177644925 for partner reported waiver req. Bug: 177962816 Test: CtsIcuTestCases Merged-In: Ic537360ec304c72468f558d7a5093a54a60d654f Change-Id: Ic537360ec304c72468f558d7a5093a54a60d654f (cherry picked from commit 5f4df32641bdf69b1a66cca7ee1c1a895e63fd6f)
2021-01-31Snap for 7112714 from 7b17d00611ddc046d53441ca8649a95fb5e62c63 to ↵android-build-prod (mdb)
pie-vts-release Change-Id: I9d7c5896cfa699ca90623387cb20134997eac4ea
2021-01-29[automerger skipped] DO NOT MERGE Cherry-pick ICU-21448: Update Android ICU ↵Almaz Mingaleev
tzdata from 2020d am: 5f4df32641 -s ours am: 8128319fcd -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/1558523 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If56f8c6d21f7b46692f556f3f17fbf09dedd7519
2021-01-29[automerger skipped] DO NOT MERGE Cherry-pick ICU-21448: Update Android ICU ↵Almaz Mingaleev
tzdata from 2020d am: 5f4df32641 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/icu/+/1558523 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I60efca8db693d99ec4093c848b1abba4c8f0867b
2021-01-26DO NOT MERGE Cherry-pick ICU-21448: Update Android ICU tzdata from 2020doreo-cts-devAlmaz Mingaleev
to 2020f. [O CTS] Cherry-pick ICU-21448: Update Android ICU tzdata from 2020d to 2020f. [O CTS] This is a cherry pick of https://github.com/unicode-org/icu/commit/25eb1510ec4e536fe0d0d1024b3ce71819510d0a. New test cases in SimpleDateFormat.java and tzfmttst.cpp were skipped as they rely on prod code changes. See https://github.com/unicode-org/icu/pull/1526/files#r552372640 for more details. For CTS, code and data changes were skipped from original CL as goal is to fix failing TimeZoneTest on devices with 2020f update. See b/177644925 for partner reported waiver req. Bug: 177962917 Test: CtsIcuTestCases Merged-In: Ic537360ec304c72468f558d7a5093a54a60d654f Change-Id: Ic537360ec304c72468f558d7a5093a54a60d654f
2019-10-28Snap for 5967452 from 902743887732cbc3d468f1e26b995fd5b6cc26dd to ↵android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-build-prod (mdb)
pie-vts-release Change-Id: I71c02509b46997d77bac36545f2a370276f55576
2019-08-26[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can ↵Victor Chang
optionally support the new Japanese era am: 92a9ce5ff3 -s ours am: 32ac18cf7a -s ours am skip reason: subject contains skip directive Change-Id: I2063529ff38235cd2db0d7f1e3ab58339006aaa9
2019-08-26[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa ↵yumaoka
support in ICU4J 58 am: fc5a01ba3d -s ours am: 8eb668d374 -s ours am skip reason: subject contains skip directive Change-Id: Ic348fbccf969786a99e632a738d10ef5bbe83c09
2019-08-26[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa ↵yumaoka
support in ICU4C 58 am: 07cd4ca63c -s ours am: 9c52a97ef0 -s ours am skip reason: subject contains skip directive Change-Id: Id27a1ebd1d633c7ea4fa26fe8010e0638774ca10
2019-08-26Merge changes from topic "reiwa_o_mr1_cts" into oreo-mr1-cts-devVictor Chang
am: 86efa9b5a7 Change-Id: Ic75ec3d48d7a035812937646da9725b98c8ae5cd
2019-08-26[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can ↵Victor Chang
optionally support the new Japanese era am: 39b8f78cbe -s ours am skip reason: subject contains skip directive Change-Id: I6c71cb9e24d500b8e7bd5e0bca16de3fa878857c
2019-08-08[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can ↵Victor Chang
optionally support the new Japanese era am: 92a9ce5ff3 -s ours am skip reason: subject contains skip directive Change-Id: I3d50be21dd3e67670abbcb68ff65791e388345d5
2019-08-08[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa ↵yumaoka
support in ICU4J 58 am: fc5a01ba3d -s ours am skip reason: subject contains skip directive Change-Id: I3e1e36f917f4ac59f0302c1ccc2b3379e5242b37
2019-08-08[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa ↵yumaoka
support in ICU4C 58 am: 07cd4ca63c -s ours am skip reason: subject contains skip directive Change-Id: I24d905aa7e1d052733fc598d8caa888aa2900431
2019-08-07DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support ↵Victor Chang
the new Japanese era Added @Test to JapaneseTest#TestHeiseiToReiwa to run the test, the annotation was missing when the test was cherry-picked form upstream Bug: 138560701 Test: CtsIcuTestCases on old and new system image Change-Id: Iadc96b33bb11c0716fb9fedd158805b32cf1644f
2019-08-07DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4J 58yumaoka
Partial cherry-pick https://github.com/unicode-org/icu/commit/913b5e8f5dbbe8ddca19c221f9867c00a9d84b94 - Exclude non-test files Update android_icu4j by running tools/srcgen/generate_android_icu4j.sh Bug: 138560701 Test: CtsIcuTestCases Test: CtsLibcoreTestCases Test: CtsLibcoreOjTestCases Change-Id: If5d3468e5dbd2b90435f0b23528cbe3d3b4c42a8
2019-08-07DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4C 58yumaoka
Cherry-pick https://github.com/unicode-org/icu/commit/76d09144a605d66adfdfd5519376598e4a8840fd Partial cherry-pick https://github.com/unicode-org/icu/commit/14a8ceb46a5773645ac140080b0b0c02106e98b5 - Exclude non-test files Bug: 138560701 Test: CtsIcuTestCases Test: CtsLibcoreTestCases Test: CtsLibcoreOjTestCases Change-Id: I9fb956a4f82f7ea126c304b2b09343dd78c76553
2019-06-21Merge changes from topic "reiwa_o_mr1_cts" into oreo-mr1-cts-devTreehugger Robot
* changes: DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support the new Japanese era DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4J 58 DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4C 58
2019-06-20Snap for 5674457 from 7ef3464ff9b06a847e4df1e507defce1d72ae454 to ↵android-vts-9.0_r10android-build-prod (mdb)
pie-vts-release Change-Id: I10353ba67b1230a574f26dddde1d24874e7b5d0e
2019-06-14[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can ↵Victor Chang
optionally support the new Japanese era am: af2b3db4ad -s ours am: 93bc1a35a2 -s ours am: 0a96c94ea4 -s ours am: c97f30efc2 -s ours am skip reason: subject contains skip directive Change-Id: I2602a213bd75d065a84ad6995df290e9917508b9
2019-06-14[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa ↵yumaoka
support in ICU4J 56 am: 18c03b9631 -s ours am: b0ffb16c65 -s ours am: 0787e23688 -s ours am: b67a881144 -s ours am skip reason: subject contains skip directive Change-Id: Ia7b52bf56147e6dc094909dc8befbf043d9671e8
2019-06-14[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa ↵yumaoka
support in ICU4C 56 am: 1aa02d75f9 -s ours am: 220221d43d -s ours am: 14bece5cf5 -s ours am: 86fffc138a -s ours am skip reason: subject contains skip directive Change-Id: I3e135bb149c72e948b9712c9630973715aae6a9c
2019-06-14[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can ↵Victor Chang
optionally support the new Japanese era am: af2b3db4ad -s ours am: 93bc1a35a2 -s ours am: 0a96c94ea4 -s ours am skip reason: subject contains skip directive Change-Id: Id858aadd6a62ce4fdc4c77f6ca1fc3649e6c4e41
2019-06-14[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa ↵yumaoka
support in ICU4J 56 am: 18c03b9631 -s ours am: b0ffb16c65 -s ours am: 0787e23688 -s ours am skip reason: subject contains skip directive Change-Id: I9327604d794c69c9215132e5906c57a8afb5e086
2019-06-14[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa ↵yumaoka
support in ICU4C 56 am: 1aa02d75f9 -s ours am: 220221d43d -s ours am: 14bece5cf5 -s ours am skip reason: subject contains skip directive Change-Id: I9407ffd74c14c085a42eb32c9390f9e7d5f7492b
2019-06-14[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can ↵Victor Chang
optionally support the new Japanese era am: af2b3db4ad -s ours am: 93bc1a35a2 -s ours am skip reason: subject contains skip directive Change-Id: I592da15621cc5d835c2dd5d5256cde7dd1bf9aa6
2019-06-14[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa ↵yumaoka
support in ICU4J 56 am: 18c03b9631 -s ours am: b0ffb16c65 -s ours am skip reason: subject contains skip directive Change-Id: I99f9e2252f665258118b1248bd81543b8e02b5d4
2019-06-14[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa ↵yumaoka
support in ICU4C 56 am: 1aa02d75f9 -s ours am: 220221d43d -s ours am skip reason: subject contains skip directive Change-Id: I75d6c2d6dd52eb0b604153a54c1c52434aa0bdf2
2019-06-14[automerger skipped] DO NOT MERGE [CtsIcuTestCases] Old Android releases can ↵nougat-mr1-cts-devVictor Chang
optionally support the new Japanese era am: af2b3db4ad -s ours am skip reason: subject contains skip directive Change-Id: I3ca1b49e04ebb10162a4b99a9b35bebb97f0195c
2019-06-14[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa ↵yumaoka
support in ICU4J 56 am: 18c03b9631 -s ours am skip reason: subject contains skip directive Change-Id: Ie37276d8dd03c90dfcf7118a50f3fc365df72154
2019-06-14[automerger skipped] DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa ↵yumaoka
support in ICU4C 56 am: 1aa02d75f9 -s ours am skip reason: subject contains skip directive Change-Id: I7ff3cec05075c81a5bcdf047be738343b1de0e5e
2019-05-21Snap for 5590171 from 65f8f1dd0fbcdebee6d21986471a8c1ddddb3ded to ↵android-build-prod (mdb)
pie-vts-release Change-Id: Icd0d01f8b7e04dea15b6b436df3c580fddca38b5
2019-05-14DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support ↵Victor Chang
the new Japanese era Added @Test to JapaneseTest#TestHeiseiToReiwa to run the test, the annotation was missing when the test was cherry-picked form upstream Bug: 132197588 Test: CtsIcuTestCases on old and new system image Change-Id: Iadc96b33bb11c0716fb9fedd158805b32cf1644f
2019-05-14DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4J 58yumaoka
Partial cherry-pick https://github.com/unicode-org/icu/commit/913b5e8f5dbbe8ddca19c221f9867c00a9d84b94 - Exclude non-test files Update android_icu4j by running tools/srcgen/generate_android_icu4j.sh Bug: 132197588 Test: CtsIcuTestCases Test: CtsLibcoreTestCases Test: CtsLibcoreOjTestCases Change-Id: If5d3468e5dbd2b90435f0b23528cbe3d3b4c42a8
2019-05-14DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4C 58yumaoka
Cherry-pick https://github.com/unicode-org/icu/commit/76d09144a605d66adfdfd5519376598e4a8840fd Partial cherry-pick https://github.com/unicode-org/icu/commit/14a8ceb46a5773645ac140080b0b0c02106e98b5 - Exclude non-test files Bug: 132197588 Test: CtsIcuTestCases Test: CtsLibcoreTestCases Test: CtsLibcoreOjTestCases Change-Id: I9fb956a4f82f7ea126c304b2b09343dd78c76553
2019-05-14DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support ↵Victor Chang
the new Japanese era Added @Test to JapaneseTest#TestHeiseiToReiwa to run the test, the annotation was missing when the test was cherry-picked form upstream Bug: 131153101 Test: CtsIcuTestCases on old and new system image Change-Id: Iadc96b33bb11c0716fb9fedd158805b32cf1644f
2019-05-14DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4J 60yumaoka
Partial cherry-pick https://github.com/unicode-org/icu/commit/223d4fb7e69b924db0e55e29162b8673bf1bb7ad - Exclude non-test files Update android_icu4j by running tools/srcgen/generate_android_icu4j.sh Bug: 131153101 Test: CtsIcuTestCases Test: CtsLibcoreTestCases Test: CtsLibcoreOjTestCases Change-Id: Ifb7ba4f2951a40ab0350eb1c2cf9f94cc89cba13
2019-05-14DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4C 60yumaoka
Partial cherry-pick https://github.com/unicode-org/icu/commit/76d09144a605d66adfdfd5519376598e4a8840fd - Exclude non-test changes Bug: 131153101 Test: CtsIcuTestCases Test: CtsLibcoreTestCases Test: CtsLibcoreOjTestCases Change-Id: Iaaf8b7b1f97073331ad554a10cafee2571a13b15
2019-05-14DO NOT MERGE [CtsIcuTestCases] Old Android releases can optionally support ↵nougat-cts-devVictor Chang
the new Japanese era Bug: 131373688 Test: CtsIcuTestCases on old and new system image Merged-In: Iadc96b33bb11c0716fb9fedd158805b32cf1644f Change-Id: Iadc96b33bb11c0716fb9fedd158805b32cf1644f
2019-05-14DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4J 56yumaoka
Partial cherry-pick https://github.com/unicode-org/icu/commit/b5999f7e7fa54c4f0fb9e9cd5e80095bb27eea32 - Exclude non-test changes Update android_icu4j by running tools/srcgen/generate_android_icu4j.sh Bug: 131373688 Test: CtsIcuTestCases Change-Id: I0e2418d35b4360c867c1a530318a2d3feb0cb2a7
2019-05-14DO NOT MERGE Cherry-pick: ICU-20536 Japanese era Reiwa support in ICU4C 56yumaoka
Partial cherry-pick https://github.com/unicode-org/icu/commit/71763fa0419ab0205b50f3c0327f17d3d9a8cf43 - Excludes non-test changes Update data binary file by ./tools/updateicudata.py Bug: 131373688 Test: CtsIcuTestCases Change-Id: Icde40db7bbb04a917676cf0ce80cf12627c5a212
2018-10-16Snap for 5072680 from d3da46fdc0f8fc21d059dbf4907b26dfaa277fc9 to ↵android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-build-prod (mdb)
pie-vts-release Change-Id: Ic66ee2452bc6de12f440a50e9605d857d71a0bdd
2018-10-11DO NOT MERGE Cherry-pick: ticket:13766: Make ↵Victor Chang
UnicodeMapTest#TestUnicodeMapGeneralCategory smaller. It has been fixed in aosp/master. Now cherry-pick the combined change into Android Pie CTS. Upstream CL: http://bugs.icu-project.org/trac/changeset/41547 This change contains several changes 1. Revert Android patch http://r.android.com/681841 2. Cherry-pick http://r.android.com/713941 3. Generate codes in android_icu4j Bug: 111640705 Bug: 111567941 Test: Verifed the test pass on the target device. cts-tradefed run cts -m CtsIcuTestCases Change-Id: Ib88bc1804334c359bc39affcb9940477ffda29c8