summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-20Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS ↵Automerger Merge Worker
branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours skipped: 71fc6b75a3 skipped: 145f724ad4 skipped: f109dbf6d3 am: e70b1a0864 -s ours am: 84846dc7e4 -s ours" into oc-mr1-dev am: 94c8571798 -s ours am: 79db781a13 -s ours am: c2378d7eb9 -s ours am: aa4305ab70 -s ours am: 95d95e2a08 -s ours am: d8319d72f5 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: Ie4a55d5fbfbbe81de48ff96798d176711ee81878
2020-07-20Merge "Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 ↵Automerger Merge Worker
CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours" into oreo-mr1-cts-dev am: 7c2d068af6 -s ours am: 4ecb654da9 -s ours am: 83d01084b9 -s ours am: bb39e4db98 -s ours am: e9ae827d54 -s ours am: 1a5c3e032b -s ours am: 3b89f48953 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: Id86b56b6d8ef00f8f3f3a1561cc1f1874bc09a13
2020-07-20Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N CTS ↵Automerger Merge Worker
branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours am: c38f4c5a7a -s ours am: c96bc20189 -s ours am: a3107e916d -s ours am: 3b87c238df -s ours am: c68b65f522 -s ours am: 7fcaaa56ef -s ours am: 59cf43c5bd -s ours am: 476f4f9d80 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: Ib87e0147a270a0715a4677f9654099136d7c1000
2020-07-20[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N CTS branch]" ↵Android Build Merger (Role)
into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours skipped: 6543d6ed08 skipped: a5a1744f72 skipped: 6ccb644512 am: c4e3a113a7 -s ours am: d718b35915 -s ours am: 44c82db8f1 -s ours am: a22282b7ff -s ours am: 4174ffabf2 -s ours am: 7840c06d8b -s ours am: 49cd5e8417 -s ours am: 647be0a0ea -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I9caf2af48465a52b99fc14c2760f21fff5b006ee
2020-07-20Merge "Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N ↵Automerger Merge Worker
CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours" into oreo-mr1-cts-dev am: a9cdeb3196 -s ours am: e97358223e -s ours am: eb5055f8bf -s ours am: 7871ce3f3b -s ours am: 2296f0a73f -s ours am: 0418e20f9a -s ours am: 952683c154 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: Ia14f51ed6c0b7ade0b90026d66f2d5ae2b96fa6d
2020-07-20[automerger skipped] [automerger] Merge "Track tzdb 2020a changes [N CTS ↵Android Build Merger (Role)
branch]" into nougat-cts-dev am: 27dfa1af40 am: f940c558b5 am: 7b8e53209f am: 68f384c726 am: 253022fb25 am: 40190e4698 am: e31a931447 -s ours am: 0695b8ab58 -s ours am: f421debad0 -s ours am: 99d4e29a38 -s ours am: e10994eda2 -s ours am: 6d00d37b2f -s ours am: 4fd49e40a1 -s ours am: a87549d0b2 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: Ia2a52418cf4036f01b68ce6a7f1ca0a57913d301
2020-07-20Merge "[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-15cb99cc4d4c429085be893ac571ecd0" into oreo-mr1-cts-dev am: 9ba7ea0b4c -s ours" into pie-cts-dev am: 5b3d134769 -s ours am: 80489e72ce -s ours am: 29b5232a46 -s ours am: 42d92fc09a -s ours am: 53515c0fec -s ours am skip reason: Change-Id If6a2dbb615a70739350cbae91cc33754afe2b793 with SHA-1 044bd5e685 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1311474 Change-Id: I9c42c51ca800532a3394ce25cc8ce1a6ba3efc35
2020-07-20Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS ↵Automerger Merge Worker
branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours am: 0181865f43 -s ours am: 887558033e -s ours am: b2a10d03b9 -s ours am: c06d07791e -s ours am: ed303c8a3f -s ours am: 5c6e1a6cfe -s ours am: bc5b273232 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: I761262b962dd5d73ecd1dc9b87140234cc38b29b
2020-07-20Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS ↵Automerger Merge Worker
branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours skipped: 71fc6b75a3 skipped: 145f724ad4 skipped: f109dbf6d3 am: e70b1a0864 -s ours am: 84846dc7e4 -s ours" into oc-mr1-dev am: 94c8571798 -s ours am: 79db781a13 -s ours am: c2378d7eb9 -s ours am: aa4305ab70 -s ours am: 95d95e2a08 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: I1ab420b8e9c2c9ee73cb45951a9702de544260ac
2020-07-20Merge "Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 ↵Automerger Merge Worker
CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours" into oreo-mr1-cts-dev am: 7c2d068af6 -s ours am: 4ecb654da9 -s ours am: 83d01084b9 -s ours am: bb39e4db98 -s ours am: e9ae827d54 -s ours am: 1a5c3e032b -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: Ie6e013cb91c36096126b7d50b2c62f125353e846
2020-07-20Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N CTS ↵Automerger Merge Worker
branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours am: c38f4c5a7a -s ours am: c96bc20189 -s ours am: a3107e916d -s ours am: 3b87c238df -s ours am: c68b65f522 -s ours am: 7fcaaa56ef -s ours am: 59cf43c5bd -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I93af7a6dc3fa63b63559c5297a5cecc355d1a79f
2020-07-20[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N CTS branch]" ↵Android Build Merger (Role)
into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours skipped: 6543d6ed08 skipped: a5a1744f72 skipped: 6ccb644512 am: c4e3a113a7 -s ours am: d718b35915 -s ours am: 44c82db8f1 -s ours am: a22282b7ff -s ours am: 4174ffabf2 -s ours am: 7840c06d8b -s ours am: 49cd5e8417 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I9e71445891809557a9877d5bf3251a519615e87a
2020-07-20Merge "Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N ↵Automerger Merge Worker
CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours" into oreo-mr1-cts-dev am: a9cdeb3196 -s ours am: e97358223e -s ours am: eb5055f8bf -s ours am: 7871ce3f3b -s ours am: 2296f0a73f -s ours am: 0418e20f9a -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I61a081a926902aecd20e43ffce1b249a3a92c81c
2020-07-20[automerger skipped] [automerger] Merge "Track tzdb 2020a changes [N CTS ↵Android Build Merger (Role)
branch]" into nougat-cts-dev am: 27dfa1af40 am: f940c558b5 am: 7b8e53209f am: 68f384c726 am: 253022fb25 am: 40190e4698 am: e31a931447 -s ours am: 0695b8ab58 -s ours am: f421debad0 -s ours am: 99d4e29a38 -s ours am: e10994eda2 -s ours am: 6d00d37b2f -s ours am: 4fd49e40a1 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I821fbe75189b76b5b2aa611d1689f3637eb7966f
2020-07-20Merge "[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-15cb99cc4d4c429085be893ac571ecd0" into oreo-mr1-cts-dev am: 9ba7ea0b4c -s ours" into pie-cts-dev am: 5b3d134769 -s ours am: 80489e72ce -s ours am: 29b5232a46 -s ours am: 42d92fc09a -s ours am skip reason: Change-Id If6a2dbb615a70739350cbae91cc33754afe2b793 with SHA-1 044bd5e685 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1311474 Change-Id: I7fa744c3d1da00a4e01d4020a7758cb6ce6b5adc
2020-07-20Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS ↵Automerger Merge Worker
branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours am: 0181865f43 -s ours am: 887558033e -s ours am: b2a10d03b9 -s ours am: c06d07791e -s ours am: ed303c8a3f -s ours am: 5c6e1a6cfe -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: I2429c178c0d4fec8a3ef8076c8b13d821dda82b0
2020-07-20Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS ↵Automerger Merge Worker
branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours skipped: 71fc6b75a3 skipped: 145f724ad4 skipped: f109dbf6d3 am: e70b1a0864 -s ours am: 84846dc7e4 -s ours" into oc-mr1-dev am: 94c8571798 -s ours am: 79db781a13 -s ours am: c2378d7eb9 -s ours am: aa4305ab70 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: I4577006770016f3a54f9590bde1f6b6f3591363a
2020-07-20Merge "Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 ↵Automerger Merge Worker
CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours" into oreo-mr1-cts-dev am: 7c2d068af6 -s ours am: 4ecb654da9 -s ours am: 83d01084b9 -s ours am: bb39e4db98 -s ours am: e9ae827d54 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: I4f3f5bbcae0219bfdda486da4dea7cb51631f7ec
2020-07-20Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N CTS ↵Automerger Merge Worker
branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours am: c38f4c5a7a -s ours am: c96bc20189 -s ours am: a3107e916d -s ours am: 3b87c238df -s ours am: c68b65f522 -s ours am: 7fcaaa56ef -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: Ifc739abe35ee62ad59d20848e6d1656e455de269
2020-07-20[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N CTS branch]" ↵Android Build Merger (Role)
into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours skipped: 6543d6ed08 skipped: a5a1744f72 skipped: 6ccb644512 am: c4e3a113a7 -s ours am: d718b35915 -s ours am: 44c82db8f1 -s ours am: a22282b7ff -s ours am: 4174ffabf2 -s ours am: 7840c06d8b -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: Idf471f67174d82e765746c583559890046c2ac3e
2020-07-20Merge "Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N ↵Automerger Merge Worker
CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours" into oreo-mr1-cts-dev am: a9cdeb3196 -s ours am: e97358223e -s ours am: eb5055f8bf -s ours am: 7871ce3f3b -s ours am: 2296f0a73f -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I102b8e5d959dfd725e2bd95dfec0dd8e2a93fbbb
2020-07-20[automerger skipped] [automerger] Merge "Track tzdb 2020a changes [N CTS ↵Android Build Merger (Role)
branch]" into nougat-cts-dev am: 27dfa1af40 am: f940c558b5 am: 7b8e53209f am: 68f384c726 am: 253022fb25 am: 40190e4698 am: e31a931447 -s ours am: 0695b8ab58 -s ours am: f421debad0 -s ours am: 99d4e29a38 -s ours am: e10994eda2 -s ours am: 6d00d37b2f -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I664422bd8413d2b3f523f16eead4d6622d0eea1e
2020-07-18Merge "[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-15cb99cc4d4c429085be893ac571ecd0" into oreo-mr1-cts-dev am: 9ba7ea0b4c -s ours" into pie-cts-dev am: 5b3d134769 -s ours am: 80489e72ce -s ours am: 29b5232a46 -s ours am skip reason: Change-Id If6a2dbb615a70739350cbae91cc33754afe2b793 with SHA-1 044bd5e685 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1311474 Change-Id: I9215e65473be6eb2ae182dc8de14dbe5d85185ec
2020-07-18Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS ↵Automerger Merge Worker
branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours am: 0181865f43 -s ours am: 887558033e -s ours am: b2a10d03b9 -s ours am: c06d07791e -s ours am: ed303c8a3f -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: Ia85e46d3b9b520de87245756f8e823549525cf7b
2020-07-18Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS ↵Automerger Merge Worker
branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours skipped: 71fc6b75a3 skipped: 145f724ad4 skipped: f109dbf6d3 am: e70b1a0864 -s ours am: 84846dc7e4 -s ours" into oc-mr1-dev am: 94c8571798 -s ours am: 79db781a13 -s ours am: c2378d7eb9 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: Ic29fab680e61dc57ba65ec8732e0072415429ec4
2020-07-18Merge "Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 ↵Automerger Merge Worker
CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours" into oreo-mr1-cts-dev am: 7c2d068af6 -s ours am: 4ecb654da9 -s ours am: 83d01084b9 -s ours am: bb39e4db98 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: I5f0f29cbcddd9314dc5117c1e261806839512ba4
2020-07-18Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N CTS ↵Automerger Merge Worker
branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours am: c38f4c5a7a -s ours am: c96bc20189 -s ours am: a3107e916d -s ours am: 3b87c238df -s ours am: c68b65f522 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I1bc0516de9331e71cc0759f2d51d46de3f8dd5eb
2020-07-18[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N CTS branch]" ↵Android Build Merger (Role)
into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours skipped: 6543d6ed08 skipped: a5a1744f72 skipped: 6ccb644512 am: c4e3a113a7 -s ours am: d718b35915 -s ours am: 44c82db8f1 -s ours am: a22282b7ff -s ours am: 4174ffabf2 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I84c940da57766812f9d6b4a15692e310f97c317e
2020-07-18Merge "Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a changes [N ↵Automerger Merge Worker
CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours" into oreo-mr1-cts-dev am: a9cdeb3196 -s ours am: e97358223e -s ours am: eb5055f8bf -s ours am: 7871ce3f3b -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I299424f822dcd6886169d23ddcf36a94a9dc9ea5
2020-07-18[automerger skipped] [automerger] Merge "Track tzdb 2020a changes [N CTS ↵Android Build Merger (Role)
branch]" into nougat-cts-dev am: 27dfa1af40 am: f940c558b5 am: 7b8e53209f am: 68f384c726 am: 253022fb25 am: 40190e4698 am: e31a931447 -s ours am: 0695b8ab58 -s ours am: f421debad0 -s ours am: 99d4e29a38 -s ours am: e10994eda2 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I6a5cd6e85a156a36f25946342a679473e8f5e0d4
2020-07-14Merge "Fix stack overflow in ↵Victor Chang
libcore.java.lang.StringTest#testFormat_invalidLocale" into rvc-dev am: 8982b713d5 am: 7e776c3e38 Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/12128015 Change-Id: I18998c3d437f9f01f8baa1623554459f988a6a41
2020-07-14Merge "Fix stack overflow in ↵Victor Chang
libcore.java.lang.StringTest#testFormat_invalidLocale" into rvc-dev am: 8982b713d5 Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/12128015 Change-Id: Ia8c3f0c295fce7c66207b8b57ebf0782d1ea9619
2020-07-14Merge "Fix stack overflow in ↵Victor Chang
libcore.java.lang.StringTest#testFormat_invalidLocale" into rvc-dev
2020-07-14Merge "Disable test causing oom failures." into rvc-dev am: d835335a94 am: ↵Christopher Ferris
10a967ca07 Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/12141924 Change-Id: I043f241200f2fcb9ff61e67c2659e1ff58948f1b
2020-07-14Merge "Disable test causing oom failures." into rvc-dev am: d835335a94Christopher Ferris
Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/12141924 Change-Id: I4aca498ff6dc7f8a7ffe6fe77efff69c80229cf5
2020-07-14Merge "Disable test causing oom failures." into rvc-devChristopher Ferris
2020-07-13Disable test causing oom failures.Christopher Ferris
Bug: 160171148 Bug: 160965370 Test: Verified the test does not run, and that no oom failure occur. Change-Id: I872aa89176b666964261d1303e20eb8f98e7e2ae
2020-07-13Fix stack overflow in libcore.java.lang.StringTest#testFormat_invalidLocaleVictor Chang
The infinite rescursion happens in this loop, i.e. LocaleData -> Compatilibity -> String.format() -> LocaleData. Point fixing can probably fix the issue now, but a future change could cause an issue again. Also, there is no easy and reliable way to write a regression test because various caches in libcore and the compatiblity framework could hide the issue from the test, but could possibly be triggered in production. This CL changes from using compatability framework to plain targetSdkVersion. Facilities, e.g. logging, overrides, provided by the compatability framework are lost, but it avoids such app crash. Bug: 160912695 Bug: 159514442 Test: atest CtsLibcoreTestCases:libcore.java.lang.StringTest Test: atest CtsLibcoreTestCases Merged-In: Id33ba5433050e17828239e6ea3b3a46766f268c7 Change-Id: Id33ba5433050e17828239e6ea3b3a46766f268c7 (cherry picked from commit 525eac57f090317d165767ae893d2905dc8c7df0)
2020-07-10Avoid String.format in Compatibility.Callbacks methods am: dcee5a316d am: ↵Orion Hodson
141b1ebf41 Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/12124704 Change-Id: Iee255d1aeec38cb5b2c185b21dc1c87eecbfbefe
2020-07-10Avoid String.format in Compatibility.Callbacks methods am: dcee5a316dOrion Hodson
Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/12124704 Change-Id: Ia1bcbdec0db24638a11d9a20553ab90a8ac25b00
2020-07-10Avoid String.format in Compatibility.Callbacks methodsOrion Hodson
Avoids infinite recursion from String.format doing LocalData compat checking. Bug: 159514442 Bug: 160912695 Test: art/tools/run-libcore-tests.sh --mode=host -- \ libcore.java.lang.StringTest Merged-In: I08c90f3478c24a3a06484b882508d564c3d4bb2b Change-Id: I08c90f3478c24a3a06484b882508d564c3d4bb2b (cherry picked from commit 3a175f5f9097139adc4d70d2c367ab9c1c0ba6f5)
2020-07-10DateFormatSymbols.getInstance(Locale.ROOT) behaves more closely to am: ↵Daulet Zhanguzin
93b558169c am: 46bbb2a13f Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/12105897 Change-Id: I755c3aecf29d0f2b6b4f36c07eedf72b1669d706
2020-07-10DateFormatSymbols.getInstance(Locale.ROOT) behaves more closely to am: ↵Daulet Zhanguzin
93b558169c Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/12105897 Change-Id: Ie82cbc30c9604785eb406b41d4abd524e9cc8436
2020-07-10DateFormatSymbols.getInstance(Locale.ROOT) behaves more closely toDaulet Zhanguzin
English locale for targetSdkVersion <= 29 In Android Q or before, when LocaleData class tries to load {@link Locale#ROOT} data, en_US_POSIX locale data is incorrectly loaded. The class used to pass "und" string as BCP47 language tag to our jni code, which then passes the string as as ICU Locale ID to ICU4C. ICU4C 63 or older version doesn't recognize "und" as a valid locale id, and fallback the default locale. The default locale is normally selected in the Locale picker in the Settings app by the user and set via frameworks. But this class statically cached the ROOT locale data before the default locale being set by framework. Thus, in Q or before, en_US_POSIX data is loaded. As https://unicode-org.atlassian.net/browse/ICU-20273, an upstream bug, is fixed, ICU version 64.1 resolved inconsistent behavior of "root", "und" and "" (empty) Locale ID which libcore previously relied on, and they are recognized correctly as {@link Locale#ROOT} since R. This ChangeId gated the change, and fallback to the old behavior by checking targetSdkVersion version. Bug: 159514442 Bug: 159047832 Test: atest CtsLibcoreTestCases Change-Id: I62207fcb104bbc5d1d970b57b13d8f8ecb1e1ba0 Merged-In: I62207fcb104bbc5d1d970b57b13d8f8ecb1e1ba0 (cherry picked from commit 7d61b511bd75e3b950fc3357e774eee5ac455776)
2020-07-09Merge "[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-15cb99cc4d4c429085be893ac571ecd0" into oreo-mr1-cts-dev am: 9ba7ea0b4c -s ours" into pie-cts-dev am: 5b3d134769 -s ours am: 80489e72ce -s ours am skip reason: Change-Id If6a2dbb615a70739350cbae91cc33754afe2b793 with SHA-1 044bd5e685 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1311474 Change-Id: I3d3cd059c44c7620f7e22de665333607347b1db9
2020-07-09Merge "Merge "Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N ↵Automerger Merge Worker
MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours" into oreo-mr1-cts-dev am: 7c2d068af6 -s ours" into pie-cts-dev am: 525ebbc0d3 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 7275c92b32 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: Ia8b278f81044ea64d2036b7de4c7378c5ce58d76
2020-07-09Merge "Merge "Merge "[automerger skipped] Merge "Merge "Track tzdb 2020a ↵Automerger Merge Worker
changes [N CTS branch]" into nougat-cts-dev am: 27dfa1af40" into nougat-mr1-cts-dev am: 2aeac88223 -s ours" into oreo-cts-dev am: 055b92daef -s ours" into oreo-mr1-cts-dev am: a9cdeb3196 -s ours" into pie-cts-dev am: b27a3fcb29 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 7275c92b32 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1317311 Change-Id: I998436bceee828009a4360bc0ae5222bb8cd4586
2020-07-09Merge "[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-15cb99cc4d4c429085be893ac571ecd0" into oreo-mr1-cts-dev am: 9ba7ea0b4c -s ours" into pie-cts-dev am: 5b3d134769 -s ours am skip reason: Change-Id If6a2dbb615a70739350cbae91cc33754afe2b793 with SHA-1 eb86fbe185 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1311474 Change-Id: Ie319de1fa413bada792fef382ee7c6e958ae05b4
2020-06-30Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS ↵Automerger Merge Worker
branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours am: 0181865f43 -s ours am: 887558033e -s ours am: b2a10d03b9 -s ours am: c06d07791e -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 7275c92b32 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: Idb8ccc07a2b026c997fa02891ae3eea2c129ab30
2020-06-30Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS ↵Automerger Merge Worker
branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours skipped: 71fc6b75a3 skipped: 145f724ad4 skipped: f109dbf6d3 am: e70b1a0864 -s ours am: 84846dc7e4 -s ours" into oc-mr1-dev am: 94c8571798 -s ours am: 79db781a13 -s ours am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 7275c92b32 is in history Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271 Change-Id: I7cf526826f9379d6eb383455f1cb124b565f0146
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 08:36:08 +0000