aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-08Merge "Snap for 11421525 from bde6760fd154933c4c492298e23cd95b7965d3e8 to ↵simpleperf-releaseAndroid Build Coastguard Worker
simpleperf-release" into simpleperf-release
2024-02-08Snap for 11421525 from bde6760fd154933c4c492298e23cd95b7965d3e8 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I020e83606dfe2a052a990aff3c4250c33ef7d563
2024-02-05Merge "[DON'T BLOCK] Test ownership migration rules" into mainTreehugger Robot
2024-02-05[DON'T BLOCK] Test ownership migration rulesAditya Choudhary
This CL is created as a best effort to migrate test targets to the new android ownership model. If you find incorrect or unnecessary attribution in this CL, please create a separate CL to fix that. For more details please refer to the link below, go/new-android-ownership-model Bug: 304529413 Test: N/A Change-Id: Ide378ee123f87e5ca97b65be50c825e1b974cece
2024-02-03Merge "Snap for 11400057 from ac3896b54f04518f24cf2ddfbcfa6d7075318697 to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2024-02-02Snap for 11400057 from ac3896b54f04518f24cf2ddfbcfa6d7075318697 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I4650d83b1a19f830a527b41dafe1d64ca8eb1be7
2023-11-22Merge "Snap for 11135399 from b6137f9685efcfbd637347f6a469f0384f9c8880 to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-11-22Snap for 11135399 from b6137f9685efcfbd637347f6a469f0384f9c8880 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I52651b5c7fdde414fc6dbe44e4508d5f2cccdc3b
2023-11-16Merge changes from topic "am-38a3a0266153492e85477b9c8bf2459b" into main am: ↵Automerger Merge Worker
b6137f9685 -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: I29796699b1136a4e7325c9423268f87efa759561 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-901da30cdf7b4b9f971df8132dfa25d2" into android14-tests-dev am: 464a845d6b -s ours am: cc67c881d8 -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: I58a1e99b7a6052130d5f739b525f5306f8c35362 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge changes from topic "am-38a3a0266153492e85477b9c8bf2459b" into mainAutomerger Merge Worker
* changes: Merge changes from topic "am-901da30cdf7b4b9f971df8132dfa25d2" into android14-tests-dev am: 464a845d6b -s ours [automerger skipped] Merge changes from topic "am-1948a3eb71fe4b7194b23286bdd98274" into android13-tests-dev am: 4a68010d02 -s ours am: 24b220b4f0 -s ours
2023-11-16Merge changes from topic "am-901da30cdf7b4b9f971df8132dfa25d2" into ↵Automerger Merge Worker
android14-tests-dev am: 464a845d6b -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: I72a35893c782721769b1f4a02e21062af04bc249 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-1948a3eb71fe4b7194b23286bdd98274" into android13-tests-dev am: 4a68010d02 -s ours am: 24b220b4f0 -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: I4a4204d9ff7992862316cfae8cd80990a505ae0a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge changes from topic "am-901da30cdf7b4b9f971df8132dfa25d2" into ↵android14-tests-devAutomerger Merge Worker
android14-tests-dev * changes: Merge changes from topic "am-1948a3eb71fe4b7194b23286bdd98274" into android13-tests-dev am: 4a68010d02 -s ours [automerger skipped] Merge changes from topic "am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-dev am: d18fec2189 -s ours am: c7a13ab7fb -s ours
2023-11-16Merge changes from topic "am-1948a3eb71fe4b7194b23286bdd98274" into ↵Automerger Merge Worker
android13-tests-dev am: 4a68010d02 -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: I92bd74df276a203e4b0276f38e61b109a7ed1f9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-dev am: d18fec2189 -s ours am: c7a13ab7fb -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: Id23876ebe320751a4a780e6c9c2b99a3a9c45a5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge changes from topic "am-1948a3eb71fe4b7194b23286bdd98274" into ↵android13-tests-devAutomerger Merge Worker
android13-tests-dev * changes: Merge changes from topic "am-9c2da1b757324288949b43f201c4a0f5" into android12L-tests-dev am: d18fec2189 -s ours [automerger skipped] Merge changes from topic "am-334b06d70b954d08ab75e0cbb80c0c95" into android12-tests-dev am: d25c162ac6 -s ours am: 1c91db4bea -s ours
2023-11-16Merge changes from topic "am-9c2da1b757324288949b43f201c4a0f5" into ↵Automerger Merge Worker
android12L-tests-dev am: d18fec2189 -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: Ib3c3b2fc0b04ef6c4f4037ba970cb393f0d8ca89 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge changes from topic ↵Automerger Merge Worker
"am-334b06d70b954d08ab75e0cbb80c0c95" into android12-tests-dev am: d25c162ac6 -s ours am: 1c91db4bea -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: Ib0e7a7dc8f708e757ceb8529bb9dfec9f20eb768 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge changes from topic "am-9c2da1b757324288949b43f201c4a0f5" into ↵android12L-tests-devAutomerger Merge Worker
android12L-tests-dev * changes: Merge changes from topic "am-334b06d70b954d08ab75e0cbb80c0c95" into android12-tests-dev am: d25c162ac6 -s ours [automerger skipped] Merge "Make okhttp tests ambivalent about TLS 1.x." into android11-tests-dev am: b09b3bf8ee -s ours am: 860ca00b85 -s ours
2023-11-16Merge changes from topic "am-334b06d70b954d08ab75e0cbb80c0c95" into ↵Automerger Merge Worker
android12-tests-dev am: d25c162ac6 -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: Ic1304e3238b86363ee48c90fcbd28d48ee6d02f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Merge "Make okhttp tests ambivalent about TLS 1.x." ↵Treehugger Robot
into android11-tests-dev am: b09b3bf8ee -s ours am: 860ca00b85 -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: I24e1be4d6fdc78c94e919e964740c28590f85559 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge changes from topic "am-334b06d70b954d08ab75e0cbb80c0c95" into ↵android12-tests-devAutomerger Merge Worker
android12-tests-dev * changes: [automerger skipped] Merge "Make okhttp tests ambivalent about TLS 1.x." into android11-tests-dev am: b09b3bf8ee -s ours [automerger skipped] Make okhttp tests ambivalent about TLS 1.x. am: b05d9c427b -s ours
2023-11-16[automerger skipped] Merge "Make okhttp tests ambivalent about TLS 1.x." ↵Treehugger Robot
into android11-tests-dev am: b09b3bf8ee -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: Ic80eacaebb98479972018641a76d801936aefe34 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16[automerger skipped] Make okhttp tests ambivalent about TLS 1.x. am: ↵Pete Bentley
b05d9c427b -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2831790 Change-Id: Ifd5eedcbaabade75295dc99cbb09e4df85fd32be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Merge "Make okhttp tests ambivalent about TLS 1.x." into android11-tests-devandroid11-tests-devTreehugger Robot
2023-11-15Make okhttp tests ambivalent about TLS 1.x.Pete Bentley
This is intended as a test-only change suitable for backporting to historic CTS branches where vendors may have disabled TLS 1.x. It does add the TLS 1.3 protocol and its ciphers to the relevant enums, which ship in the platform but are not actually used on Android. All Android HttpsURLConnections use a predefined ConnectionSpec defined in HttpsHandler which enables all cipher suites and protocols, i.e. on Android, URL connections are intended to pick up the correct parameters from their socket factory, rather than using the ConnectionSpec API to set them. tl;dr much of the changes are to tests for APIs which are not reachable on Android, but which we should continue to test. Bug: 288058606 Test: atest CtsLibcoreOkHttpTestcases (with and without TLS 1.0/1.1 disabled) Change-Id: I57bd878f25a83763933a453dc6e18c349ed28028 Merged-In: I57bd878f25a83763933a453dc6e18c349ed28028 (cherry picked from commit 77e54e8fb179433aa506b1109127b333bc7a3710) (cherry picked from commit 575eec286b9f1c05eaf2998038f89d60644ededd)
2023-10-30Merge "Snap for 11024862 from 70c28d53f28765576519df8a00b62bc570989d71 to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-10-30Snap for 11024862 from 70c28d53f28765576519df8a00b62bc570989d71 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I74d2c2922d52585e8df90c59b90d2617deee7f9b
2023-10-26[automerger skipped] Merge "Merge android14-tests-dev" into main am: ↵Xin Li
70c28d53f2 -s ours am skip reason: Merged-In Ife778514f97b28c2094680c9314daafa72e11829 with SHA-1 61bccd5f97 is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2781500 Change-Id: I978e28b17373d199568f58f295d51d9379f9bf4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26[automerger skipped] Merge android14-tests-dev am: 033c305166 -s oursXin Li
am skip reason: Merged-In Ife778514f97b28c2094680c9314daafa72e11829 with SHA-1 61bccd5f97 is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2781500 Change-Id: Icbe0b0c99a631079df273c9a628d5816328a2582 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26Merge "Merge android14-tests-dev" into mainXin Li
2023-10-26Merge android14-tests-devXin Li
Bug: 263910020 Merged-In: Ife778514f97b28c2094680c9314daafa72e11829 Change-Id: I999d46115b18b3c76cb5d393856ff4cbfb3c51d8
2023-10-16Merge "Snap for 10957012 from 3c174b1b703fb00ced4a463bb443ccb5a5598591 to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-10-16Snap for 10957012 from 3c174b1b703fb00ced4a463bb443ccb5a5598591 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I9fb861e669cbd817ae42962f9f36ada16ddc177a
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 3c174b1b70 -s ↵Xin Li
ours am: c7f8ec264c -s ours am: 6bf0462773 -s ours am: 74e831404e -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2775004 Change-Id: I696ccfe716b52dd9eff3afb60542ec9791d03c57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: bb3023d371 -s ours am: 5e7949ffb0 ↵Xin Li
-s ours am: 34ed0eb56c -s ours am: ab1e02316d -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2775004 Change-Id: I60991a3ef5671b007d60d757d9754766898b1765 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 3c174b1b70 -s ↵Xin Li
ours am: c7f8ec264c -s ours am: 6bf0462773 -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2775004 Change-Id: I441caa50df83f53794cc20bf59001765995a9a0a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: bb3023d371 -s ours am: 5e7949ffb0 ↵Xin Li
-s ours am: 34ed0eb56c -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2775004 Change-Id: Ic10086e947b86c23a044e1579e20e5e6375f3568 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 3c174b1b70 -s ↵Xin Li
ours am: c7f8ec264c -s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2775004 Change-Id: Ie55791ec7649526253cb9ac870935eeb60506216 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: bb3023d371 -s ours am: 5e7949ffb0 ↵Xin Li
-s ours am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2775004 Change-Id: Icf16df54da67f5949de888323bd6684938c27346 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: 3c174b1b70 -s oursXin Li
am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2775004 Change-Id: If108071c1ab93b3c71b50c54d35ccf5e5ca7c46c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: bb3023d371 -s oursXin Li
am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 575eec286b is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2775004 Change-Id: Id30ed796cce98710342d2260941733e3eed3f5f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge "Merge Android 14" into mainXin Li
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I57bd878f25a83763933a453dc6e18c349ed28028 Change-Id: Ia122c011ce4aea6a5493c0b0057d0c05b563019f
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 5122984808 -s ours ↵Xin Li
am: cf12cd7a5a -s ours am: e2aac2b2b3 -s ours am skip reason: Merged-In Ie12b62274864460fec6a5f81edefc8a1b131269f with SHA-1 8341b930cd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/24182823 Change-Id: Ie35a0279bd08fc8ea481b38241ee5597c5a947e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 5122984808 -s ours ↵Xin Li
am: cf12cd7a5a -s ours am skip reason: Merged-In Ie12b62274864460fec6a5f81edefc8a1b131269f with SHA-1 8341b930cd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/24182823 Change-Id: I9c2153064da70682035ba22dd9e6563088ee4717 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 5122984808 -s oursXin Li
am skip reason: Merged-In Ie12b62274864460fec6a5f81edefc8a1b131269f with SHA-1 8341b930cd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/24182823 Change-Id: I5574a1fe3c37f62bbdc72daeb6a71a7bed560839 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: Ie12b62274864460fec6a5f81edefc8a1b131269f Change-Id: I21dd37ddaa86a1678a89fa370cc2edcf864343d6
2023-08-04Merge "Snap for 10612529 from ea3bf3430ae4d8fbe76a42f1eaf575e9b63e34fa to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 19:30:36 +0000