summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Do not accept zip files with invalid headers.HEADs12.1Almaz Mingaleev2025-06-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | According to Section 4.3.6 in [1] non-empty zip file starts with local file header. 4.3.1 allows empty files, and in such case file starts with "end of central directory record". This aligns ZipFile with libziparchive modulo empty zip files - libziparchive rejects them. Tests are skipped because sc-dev branch uses ART module prebuilts, but builds tests from sources which leads to presubmit failures. Ignore-AOSP-First: b/309938635#comment1 [1] https://pkwaredownloads.blob.core.windows.net/pem/APPNOTE.txt Bug: 309938635 Test: CtsLibcoreTestCases Test: CtsLibcoreOjTestCases (cherry picked from commit 288a44a1817707110cdf5a3a6ef8377c6e10cce2) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de4023dd7bed3c61a74397261b09d40dcd39668e) Merged-In: I545cdd49ec3cc138331145f4716c8148662a478b Change-Id: I545cdd49ec3cc138331145f4716c8148662a478b
* libcore: Add hooks for Dynamite module support in GmsCompatDanny Lin2022-03-154-1/+83
| | | | | | | | | | | | | These hooks are necessary for GmsCompat to support Google Play Services' dynamic module system (Dynamite) without weakening the SELinux sandbox to allow other apps to open module APKs from /data/user_de/0/com.google.android.gms/app_chimera/m. To minimize changes in libcore, each hook is a simple interface method call that delegates the actual hook code to GmsCompat in frameworks/base. Change-Id: I49c7c2b2fe8b356137dbc90955a7b63684253457
* ZipFile: Add support for opening zip files by fd pathsDanny Lin2022-03-151-1/+6
| | | | | | | | | | | | | | | | | | In some cases, it can be useful to open and parse zip files that are only available by fd reference. For example, file descriptors of APKs containing files to load may be sent via Binder IPC for clients to use. Unfortuantely, while it is already possible for StrictJarFile to open APKs by file descriptor, using that API is not an option because our /proc/self/fd/## path is passed to DexPathList for use in ClassLoader implementations. This is necessary for compatibility with Google Play Services' dynamic module system (Dynamite) without weakening the SELinux sandbox to allow other apps to open module APKs from /data/user_de/0/com.google.android.gms/app_chimera/m. Change-Id: Ibb099307a4267707f2de73369b5665b7af26352b
* Snap for 8055317 from e42572a24e64f8511dbbf2e83f79fb08303de1a0 to sc-v2-releaseAndroid Build Coastguard Worker2022-01-082-6/+29
|\ | | | | | | Change-Id: I439b97c65b732136f4da8800e6727de3dbb53a1a
| * DO NOT MERGE Fix tests which relied on Pacific/Apia DST offset [S CTS]Almaz Mingaleev2022-01-062-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tzdata module prebuilts were updated to 2021a1 (2021b) in ag/16249425 and ag/16282952 enabled them. That caused failures in tests which expected explicit offset in certain time zones. java.util.TimeZone APIs allow to check offsets on specifc time, but DateFormatSymbols always returns data as of now. So I've changed them to be consistent with java.util.TimeZone. Bug: 201301255 Bug: 204279800 Bug: 211073707 Test: atest luni/src/test/java/libcore/java/test/DateFormatSymbolsTest.java Test: atest luni/src/test/java/libcore/java/util/TimeZoneTest.java Change-Id: I9e13e6c4552697957f8eb3e3b0327fe7d321bef9 Merged-In: I9e13e6c4552697957f8eb3e3b0327fe7d321bef9
* | Snap for 7963886 from 6b77689961d97460a1d99a949144f92354693c98 to sc-v2-releaseAndroid Build Coastguard Worker2021-12-030-0/+0
|\| | | | | | | Change-Id: I5ea703749e991a3f836939ffe070f6a07c443596
| * [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am: 2fc56ad728 -s ours am: 3c4d8821e4 -s ours am: 0f795e6e20 -s ours am: 14cb7364ee -s ours am: d403c38205 -s ours am: 3d62ab6f07 -s ours am: 869789f3f3 -s ours am: b581c91347 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: Ie42d6202bcc0159e5b958275f6fc57cc862b7949
| | * [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am: 2fc56ad728 -s ours am: 3c4d8821e4 -s ours am: 0f795e6e20 -s ours am: 14cb7364ee -s ours am: d403c38205 -s ours am: 3d62ab6f07 -s ours am: 869789f3f3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I922b4f791d5751db0b25c927c77e141a1f6e6b56
| | | * [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am: 2fc56ad728 -s ours am: 3c4d8821e4 -s ours am: 0f795e6e20 -s ours am: 14cb7364ee -s ours am: d403c38205 -s ours am: 3d62ab6f07 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: Ie4185d63dea212be4862bac3d2ebb5efe1da04fe
| | | | * [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am: 2fc56ad728 -s ours am: 3c4d8821e4 -s ours am: 0f795e6e20 -s ours am: 14cb7364ee -s ours am: d403c38205 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I7dd7cdfda538fc4d456e1b34dc28d1e68aade3bf
| * | | | | Merge "[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Automerger Merge Worker2021-12-020-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours" into pie-cts-dev am: 9fb91d6a1a -s ours am: b86f5c7e54 -s ours am: 559f60b0d1 -s ours am: 1dd591c76a -s ours am: 58a510bf97 -s ours am: 0b95dacb30 -s ours am: ac8485fc6c -s ours am: 70671d6d35 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I7185b6b91f74fd1e5ddc5f8642f25a128f4dbe77
| | * | | | Merge "[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Automerger Merge Worker2021-12-020-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours" into pie-cts-dev am: 9fb91d6a1a -s ours am: b86f5c7e54 -s ours am: 559f60b0d1 -s ours am: 1dd591c76a -s ours am: 58a510bf97 -s ours am: 0b95dacb30 -s ours am: ac8485fc6c -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I927f195f708baf55dbc6b3ed02f37d7830bb4897
| | | * | | Merge "[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Automerger Merge Worker2021-12-020-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours" into pie-cts-dev am: 9fb91d6a1a -s ours am: b86f5c7e54 -s ours am: 559f60b0d1 -s ours am: 1dd591c76a -s ours am: 58a510bf97 -s ours am: 0b95dacb30 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I802086addaca4cc91d8fe7827bf0d6e7b6a434dc
| | | | * | Merge "[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Automerger Merge Worker2021-12-020-0/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours" into pie-cts-dev am: 9fb91d6a1a -s ours am: b86f5c7e54 -s ours am: 559f60b0d1 -s ours am: 1dd591c76a -s ours am: 58a510bf97 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: Ic8c3d1c24d148e4194ee21178c5a3606dec4def3
| * | | | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [P-CTS]" into pie-cts-dev am: aef3dc4fa5 -s ours am: f56d2e6962 -s ours am: 0d242d8580 -s ours am: 512527dc51 -s ours am: 674a2c7dd8 -s ours am: dd7777b230 -s ours am: 3a719a102b -s ours am: d270ed6f66 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903516 Change-Id: I7432ab691b4cc4018450455b7e4f75fb0a8fc26e
| | * | | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [P-CTS]" into pie-cts-dev am: aef3dc4fa5 -s ours am: f56d2e6962 -s ours am: 0d242d8580 -s ours am: 512527dc51 -s ours am: 674a2c7dd8 -s ours am: dd7777b230 -s ours am: 3a719a102b -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903516 Change-Id: Ie5557c301101c36fa81145617954ac4860ebff91
| | | * | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [P-CTS]" into pie-cts-dev am: aef3dc4fa5 -s ours am: f56d2e6962 -s ours am: 0d242d8580 -s ours am: 512527dc51 -s ours am: 674a2c7dd8 -s ours am: dd7777b230 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903516 Change-Id: I895955fdfdf5a3297bc2f0767a2f308eb65ae8c2
| | | | * | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [P-CTS]" into pie-cts-dev am: aef3dc4fa5 -s ours am: f56d2e6962 -s ours am: 0d242d8580 -s ours am: 512527dc51 -s ours am: 674a2c7dd8 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903516 Change-Id: I2fa803c180bafbfa11ab1c9b9007c5e820c952bc
| * | | | | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am: 2fc56ad728 -s ours am: 3c4d8821e4 -s ours am: 0f795e6e20 -s ours am: 14cb7364ee -s ours am: d403c38205 -s ours am: a3899efb11 -s ours am: ef98930bfa -s ours am: d71c8cca92 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: Ib03c965ffe7cb443eaf5f963489bdec027bcb7db
| | * | | | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am: 2fc56ad728 -s ours am: 3c4d8821e4 -s ours am: 0f795e6e20 -s ours am: 14cb7364ee -s ours am: d403c38205 -s ours am: a3899efb11 -s ours am: ef98930bfa -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: Ib5e2074130f8cfda149bfc86a95877f42e3ae6f6
| | | * | | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am: 2fc56ad728 -s ours am: 3c4d8821e4 -s ours am: 0f795e6e20 -s ours am: 14cb7364ee -s ours am: d403c38205 -s ours am: a3899efb11 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: Id35c039fde84bc416e7e6247c2c629f836485bd3
| | | | * \ \ \ \ [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am: 2fc56ad728 -s ours am: 3c4d8821e4 -s ours am: 0f795e6e20 -s ours am: 14cb7364ee -s ours am: d403c38205 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: Ia21af007fb42bb92abe97a95bd90b5a1f5bc6b91
| | | | | * | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | | | |\ \ \ \ | | | | | | |_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am: 2fc56ad728 -s ours am: 3c4d8821e4 -s ours am: 0f795e6e20 -s ours am: 14cb7364ee -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I5660e19fb4ce7827d9fdc7368eafd3a70e42ffb6
| | | | | | * | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am: 2fc56ad728 -s ours am: 3c4d8821e4 -s ours am: 0f795e6e20 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I2600af335769f65e4f3247dc119e257034ef5a17
| | | | | | | * \ \ [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am: 2fc56ad728 -s ours am: 3c4d8821e4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: Idbb7ede73e8c424e172ab8daf188ceeae5f59357
| | | | | | | | * \ \ [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am: 2fc56ad728 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I1e91f0314c3f2c951cb1c09cb3440fb99687b087
| | | | | | | | | * \ \ [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I313856603386489c95259babcfb4ea959a628698
| * | | | | | | | | | | | Merge "[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Automerger Merge Worker2021-12-020-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours" into pie-cts-dev am: 9fb91d6a1a -s ours am: b86f5c7e54 -s ours am: 559f60b0d1 -s ours am: 1dd591c76a -s ours am: 58a510bf97 -s ours am: b2865952cc -s ours am: 522cf46c19 -s ours am: 6b48f551c2 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I6c9e80399f00573e20379fc366108f276ff44da3
| | * | | | | | | | | | | Merge "[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Automerger Merge Worker2021-12-020-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours" into pie-cts-dev am: 9fb91d6a1a -s ours am: b86f5c7e54 -s ours am: 559f60b0d1 -s ours am: 1dd591c76a -s ours am: 58a510bf97 -s ours am: b2865952cc -s ours am: 522cf46c19 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I6b9159538521e87aabd2f712b91ff843df5fd1d0
| | | * | | | | | | | | | Merge "[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Automerger Merge Worker2021-12-020-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours" into pie-cts-dev am: 9fb91d6a1a -s ours am: b86f5c7e54 -s ours am: 559f60b0d1 -s ours am: 1dd591c76a -s ours am: 58a510bf97 -s ours am: b2865952cc -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I6d9d26f497a7a5c9714ed006a9c5d470bfc0fb0e
| | | | * | | | | | | | | Merge "[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Automerger Merge Worker2021-12-020-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours" into pie-cts-dev am: 9fb91d6a1a -s ours am: b86f5c7e54 -s ours am: 559f60b0d1 -s ours am: 1dd591c76a -s ours am: 58a510bf97 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I8e66af599dc118ed04fe1a1a5a56c2fc07bacc5c
| | | | | * | | | | | | | Merge "[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Automerger Merge Worker2021-12-020-0/+0
| | | | | |\| | | | | | | | | | | | | |_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours" into pie-cts-dev am: 9fb91d6a1a -s ours am: b86f5c7e54 -s ours am: 559f60b0d1 -s ours am: 1dd591c76a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: Id7c8781ef439a9bc86cea1f3af2f56ec1b4aba13
| | | | | | * | | | | | Merge "[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Automerger Merge Worker2021-12-020-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours" into pie-cts-dev am: 9fb91d6a1a -s ours am: b86f5c7e54 -s ours am: 559f60b0d1 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I4161fc7e4496336b7f31608db4762507d26a9e94
| | | | | | | * | | | | Merge "[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Automerger Merge Worker2021-12-020-0/+0
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours" into pie-cts-dev am: 9fb91d6a1a -s ours am: b86f5c7e54 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I7b328babbcaad1f0eb100eefbf07dcdaaec0cf1b
| | | | | | | | * | | | Merge "[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Automerger Merge Worker2021-12-020-0/+0
| | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours" into pie-cts-dev am: 9fb91d6a1a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: Iddce245066df6b85de2a3138c64d96c611e080cd
| | | | | | | | | * \ \ \ Merge "[automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Automerger Merge Worker2021-12-020-0/+0
| | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours" into pie-cts-dev
| | | | | | | | | | * | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | | | | | | | |/| | | | | | | | | | | | | | | |/ / | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [O-MR1-CTS]" into oreo-mr1-cts-dev am: 61e0123122 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903514 Change-Id: I91772211655661c06eb2e159bff45e05ddf29d2d
| | | | | | | | | | * | | Merge "DO NOT MERGE Fix tests which relied on Pacific/Apia DST offset. ↵Almaz Mingaleev2021-12-022-6/+29
| | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [O-MR1-CTS]" into oreo-mr1-cts-dev
| | | | | | | | | | | * | | DO NOT MERGE Fix tests which relied on Pacific/Apia DST offset.Almaz Mingaleev2021-11-262-6/+29
| | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [O-MR1-CTS] java.util.TimeZone APIs allow to check offsets on specifc time, but DateFormatSymbols always returns data as of now. So I've changed them to be consistent with java.util.TimeZone. Bug: 207111172 Bug: 207805859 Test: atest luni/src/test/java/libcore/java/test/DateFormatSymbolsTest.java Test: atest luni/src/test/java/libcore/java/util/TimeZoneTest.java Change-Id: I9e13e6c4552697957f8eb3e3b0327fe7d321bef9 Merged-In: I9e13e6c4552697957f8eb3e3b0327fe7d321bef9
| * | | | | | | | | | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [P-CTS]" into pie-cts-dev am: aef3dc4fa5 -s ours am: f56d2e6962 -s ours am: 0d242d8580 -s ours am: 512527dc51 -s ours am: 674a2c7dd8 -s ours am: 2b7abe3f1f -s ours am: 3c131e3564 -s ours am: f0f7337887 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903516 Change-Id: I4cb2c02ab747a21e419f006ae09ca86e442f96ae
| | * | | | | | | | | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [P-CTS]" into pie-cts-dev am: aef3dc4fa5 -s ours am: f56d2e6962 -s ours am: 0d242d8580 -s ours am: 512527dc51 -s ours am: 674a2c7dd8 -s ours am: 2b7abe3f1f -s ours am: 3c131e3564 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903516 Change-Id: I8b8441966367a4092e00b1231032832735ccef11
| | | * | | | | | | | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [P-CTS]" into pie-cts-dev am: aef3dc4fa5 -s ours am: f56d2e6962 -s ours am: 0d242d8580 -s ours am: 512527dc51 -s ours am: 674a2c7dd8 -s ours am: 2b7abe3f1f -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903516 Change-Id: I5302619a0681a6c2a3c190e72273db7942aa7cb0
| | | | * | | | | | | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [P-CTS]" into pie-cts-dev am: aef3dc4fa5 -s ours am: f56d2e6962 -s ours am: 0d242d8580 -s ours am: 512527dc51 -s ours am: 674a2c7dd8 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903516 Change-Id: I5a89d80e1fd1fdc50d2cb47228fb92b2ac866ff6
| | | | | * | | | | | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [P-CTS]" into pie-cts-dev am: aef3dc4fa5 -s ours am: f56d2e6962 -s ours am: 0d242d8580 -s ours am: 512527dc51 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903516 Change-Id: I25cf2462c683a1ddc86ab90b09302b6bcad11721
| | | | | | * | | | | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [P-CTS]" into pie-cts-dev am: aef3dc4fa5 -s ours am: f56d2e6962 -s ours am: 0d242d8580 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903516 Change-Id: I616eeefabf8d097628eb5984e38e36471afe6ae1
| | | | | | | * | | | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [P-CTS]" into pie-cts-dev am: aef3dc4fa5 -s ours am: f56d2e6962 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903516 Change-Id: I15912ecb2799c8691a38b392bb1f96cb12589908
| | | | | | | | * | | | | [automerger skipped] Merge "DO NOT MERGE Fix tests which relied on ↵Almaz Mingaleev2021-12-020-0/+0
| | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pacific/Apia DST offset. [P-CTS]" into pie-cts-dev am: aef3dc4fa5 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/libcore/+/1903516 Change-Id: I8f9dc6afa40c7122fc829cbccdd6475a40d39cf7
| | | | | | | | | * | | | Merge "DO NOT MERGE Fix tests which relied on Pacific/Apia DST offset. ↵Almaz Mingaleev2021-12-022-6/+29
| | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [P-CTS]" into pie-cts-dev
| | | | | | | | | | * | | | DO NOT MERGE Fix tests which relied on Pacific/Apia DST offset. [P-CTS]Almaz Mingaleev2021-11-262-6/+29
| | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | java.util.TimeZone APIs allow to check offsets on specifc time, but DateFormatSymbols always returns data as of now. So I've changed them to be consistent with java.util.TimeZone. Bug: 205971225 Bug: 207805859 Test: atest luni/src/test/java/libcore/java/test/DateFormatSymbolsTest.java Test: atest luni/src/test/java/libcore/java/util/TimeZoneTest.java Change-Id: I9e13e6c4552697957f8eb3e3b0327fe7d321bef9 Merged-In: I9e13e6c4552697957f8eb3e3b0327fe7d321bef9
* | | | | | | | | | | | | Snap for 7856912 from a510ea09f31fa95ed23827b9d9990b50e43cde3f to sc-v2-releaseAndroid Build Coastguard Worker2021-10-260-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I99ff1bf14d427adba454e1cf85d89808de2c48ea