aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-07-06Merge "Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into ↵android-cts-14.0_r2Automerger Merge Worker
android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev am: cfb4611fa4 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786 Change-Id: Ife778514f97b28c2094680c9314daafa72e11829 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Merge "Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into ↵Automerger Merge Worker
android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev
2023-07-06Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into ↵Automerger Merge Worker
android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786 Change-Id: Ib28cae2c291da70863de49c294ed86212d0a06a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into ↵Automerger Merge Worker
android12-tests-dev am: ffff5e64a6" into android12L-tests-dev
2023-07-06Merge "Make okhttp tests ambivalent about TLS 1.x." into android12-tests-dev ↵Treehugger Robot
am: ffff5e64a6 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786 Change-Id: If950dfd6cf0d2dce75e6f04e181e7a78d36340b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06Merge "Make okhttp tests ambivalent about TLS 1.x." into android12-tests-devTreehugger Robot
2023-07-05Make 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)
2023-06-14Pin okhttp-norepackage to Java 1.8android14-devSorin Basca
Bug: 286522448 Test: vendor/google/modules/ArtGoogle/build-art-module.sh and check jars (cherry picked from https://android-review.googlesource.com/q/commit:b30416588628656f6b31de5a1b58af4a1ee12ac9) Merged-In: I02b0bf830bedbbfff99d9734a628db3eb8d79f83 Change-Id: I02b0bf830bedbbfff99d9734a628db3eb8d79f83 (cherry picked from commit e848911eb36f39082da5c0e6c6750d77392a76cf)
2023-04-04[automerge] Add com.android.ondevicepersonalization to apex_available. 2p: ↵Andrew Vuong
0e806edcba Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/22453944 Bug: 276784992 Change-Id: If8fe175f7ed73eeb29516bc48b7f0819dea3b46b
2023-04-03Add com.android.ondevicepersonalization to apex_available.Andrew Vuong
Bug: 276784992 Test: TH Change-Id: I9f0c851f57ff6f4ca51edd5eabdb691bff92ff03
2023-02-17(TM-MP) Rb back compat: Base changes am: a02ad6dc10Neha Pattan
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/21184090 Change-Id: I8b1db8764cba10932c7345a329d51ce6ae2abc49 Merged-In: I68c5ca048801ab4fc44fd091044cbbc370757fce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Bug: 263816046 Ignore-AOSP-First: Automerger fix
2023-02-02(TM-MP) Rb back compat: Base changesNeha Pattan
Bug: 263816046 Test: manual Change-Id: Ibae437bf9b5ed51b80030a4f172301e0073c513b
2023-01-13Merge "Fix test socket reuse during shutdown" am: a1ec784e84 am: 788860d051 ↵Treehugger Robot
am: 6f4272f602 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2387952 Change-Id: I36f25b326105b7921f11f9c92fe2999894529256 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13Merge "Fix test socket reuse during shutdown" am: a1ec784e84 am: 788860d051Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2387952 Change-Id: I121bc304d267ae1bbf31df10ec1668fdf8a6d3b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13Merge "Fix test socket reuse during shutdown" am: a1ec784e84android-u-beta-1-gplTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2387952 Change-Id: Icde25e2bb34a609a4bbfa25a44f02011c510ab62 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13Merge "Fix test socket reuse during shutdown"main-16k-with-phonesTreehugger Robot
2023-01-13Fix test socket reuse during shutdownSorin Basca
Fixes: 264790610 Test: atest CtsLibcoreOkHttpTestCases:com.squareup.okhttp.ConnectionReuseTest#staleConnectionNotReusedForNonIdempotentRequest Test: atest CtsLibcoreOkHttpTestCases:com.squareup.okhttp.URLConnectionTest Change-Id: Ibc766ff1b67f26d0b4d6bfd67bdf3be6af5bfc3e
2023-01-12Merge "Ignore flaky ↵Treehugger Robot
ConnectionReuseTest#staleConnectionNotReusedForNonIdempotentRequest" am: 20df2b1ab5 am: 2fe29f6403 am: 2ac70db883 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2386112 Change-Id: Iabef2e4d9d808e35d014f885d656bf63a17a45ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12Merge "Ignore flaky ↵Treehugger Robot
ConnectionReuseTest#staleConnectionNotReusedForNonIdempotentRequest" am: 20df2b1ab5 am: 2fe29f6403 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2386112 Change-Id: I14a4229d974defb79c4881f3ae85aa4b957072e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12Merge "Ignore flaky ↵Treehugger Robot
ConnectionReuseTest#staleConnectionNotReusedForNonIdempotentRequest" am: 20df2b1ab5 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2386112 Change-Id: I5502293468c0f97abe013d2935867d06e0698948 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12Merge "Ignore flaky ↵Treehugger Robot
ConnectionReuseTest#staleConnectionNotReusedForNonIdempotentRequest"
2023-01-12Ignore flaky ConnectionReuseTest#staleConnectionNotReusedForNonIdempotentRequestSorin Basca
Bug: 264790610 Test: atest CtsLibcoreOkHttpTestCases:com.squareup.okhttp.ConnectionReuseTest#staleConnectionNotReusedForNonIdempotentRequest Change-Id: Iacde2d1d5f429ab8a49d7969afd939e9329e3eb6
2022-11-30[automerger skipped] Extend the visibility of okhttp to all of libcore am: ↵Orion Hodson
c72140fd8e -s ours am skip reason: Merged-In I71040aeb29b4c985b9e84a123295791530206d45 with SHA-1 e86d5b03c5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/20579916 Change-Id: Ibaf6264f467b5fcd148fd66637b01726507ab020 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29Extend the visibility of okhttp to all of libcoreOrion Hodson
Required for some blueprint file re-structuring in libcore. Bug: 255273691 Bug: 255275437 Test: m Change-Id: I71040aeb29b4c985b9e84a123295791530206d45 Merged-In: I71040aeb29b4c985b9e84a123295791530206d45 (cherry picked from commit e86d5b03c5a6b1621800c1dfec86c372377dc7ea)
2022-11-17[automerger skipped] [PATCH] Enable new_robolectric am: 04d65d2ba6 am: ↵Rex Hoffman
452440957e am: c11b165593 -s ours am: 53dfa25eb6 -s ours am skip reason: Merged-In Iea16ea478624c054540ddaeb177adf12ccb0abc3 with SHA-1 6d97c64139 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/20464386 Change-Id: I45884edf13bf4f4cd7d32c01d9e3fbcfe0e705b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17[automerger skipped] [PATCH] Enable new_robolectric am: 04d65d2ba6 am: ↵Rex Hoffman
452440957e am: c11b165593 -s ours am skip reason: Merged-In Iea16ea478624c054540ddaeb177adf12ccb0abc3 with SHA-1 6d97c64139 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/20464386 Change-Id: If163bc3c050c9d501818c97001292bb408ce8651 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17[PATCH] Enable new_robolectric am: 04d65d2ba6 am: 452440957eandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseRex Hoffman
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/20464386 Change-Id: Ib7ac71028744d88b5789bca6a3de5b943c26bb22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17[automerger skipped] [PATCH] Enable new_robolectric am: 04d65d2ba6 am: ↵Rex Hoffman
d91fa43a1e -s ours am skip reason: Merged-In Iea16ea478624c054540ddaeb177adf12ccb0abc3 with SHA-1 6d97c64139 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/20464386 Change-Id: Id7bdc869d87547c74f418addc8a116f42bfe5ef8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17[PATCH] Enable new_robolectric am: 04d65d2ba6Rex Hoffman
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/20464386 Change-Id: I98ec18d0b6e221d620c710c456637f6618dac5f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17[PATCH] Enable new_robolectric am: 04d65d2ba6Rex Hoffman
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/20464386 Change-Id: Id4aea6991cfb587701ba8bb1cf2f8b5e975292f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-13[PATCH] Enable new_robolectricRex Hoffman
Test: mma in /external/robolectric Bug: 244627502 Change-Id: Iea16ea478624c054540ddaeb177adf12ccb0abc3 Merged-In: Iea16ea478624c054540ddaeb177adf12ccb0abc3
2022-11-05Allow OkHttp to be used by com.android.devicelock.Krzysztof Kosiński
Bug: 228907574 Test: mm in packages/modules/DeviceLock Change-Id: Iac7dcd1e537bbc6b54e2a0e9421b95a855d86850
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 7c2c3f58b6 am: ↵Treehugger Robot
2be23af2c0 am: ef11f8eeee Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2255484 Change-Id: I93ab22497089a5b5f5ae6276bc59535e081bf337 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 7c2c3f58b6 am: ↵Treehugger Robot
2be23af2c0 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2255484 Change-Id: Ib254844eef597a8654b210ca581ad61839c44db1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors" am: 7c2c3f58b6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2255484 Change-Id: I042931af45953c78b2d653016b153e112434ad91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26Merge "Fix errorprone warnings that should be errors"Treehugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 02:18:22 +0000