diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-06 02:05:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-07-06 02:05:40 +0000 |
| commit | 1ad6d60225c55f429ac640cdabb6310ac3c2fa7b (patch) | |
| tree | 42f709058355e82a7cc5690bdda533e19dde1e88 | |
| parent | 07bf32304d6afcd00371dcdacb4e9a312cef58d1 (diff) | |
| download | superproject-1ad6d60225c55f429ac640cdabb6310ac3c2fa7b.tar.gz | |
Update git submodules
* Update platform/external/okhttp from branch 'master'
to 9fe5e6059366fca2a8fd4499a1687973096f8feb
- Merge changes from topic "am-656fb3c8dbe747e58a051c3bd446ce90"
* changes:
[automerger skipped] Merge "Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev am: cfb4611fa4 -s ours
[automerger skipped] Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c am: 51b3d69173 -s ours
- [automerger skipped] Merge "Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev am: cfb4611fa4 -s ours
am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 77e54e8fb1 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786
Change-Id: I758aa93df6688975df7a0ecc516eb6f5fecf2a56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
- [automerger skipped] Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c am: 51b3d69173 -s ours
am skip reason: Merged-In I57bd878f25a83763933a453dc6e18c349ed28028 with SHA-1 77e54e8fb1 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2646786
Change-Id: I398ed9b967933465e35854e9edce11cf02f9c3bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
- Merge "Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into android12-tests-dev am: ffff5e64a6" into android12L-tests-dev am: 48629c761c" into android13-tests-dev
- Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into 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>
- Merge "Merge "Make okhttp tests ambivalent about TLS 1.x." into android12-tests-dev am: ffff5e64a6" into android12L-tests-dev
- Merge "Make okhttp tests ambivalent about TLS 1.x." into android12-tests-dev 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>
- Merge "Make okhttp tests ambivalent about TLS 1.x." into android12-tests-dev
- Make okhttp tests ambivalent about TLS 1.x.
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)
| m--------- | platform/external/okhttp | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/platform/external/okhttp b/platform/external/okhttp -Subproject c7e0dadb72a852a0379a08f7744ccbf89cb6a06 +Subproject 9fe5e6059366fca2a8fd4499a1687973096f8fe |