aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-08-13[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseXin Li
am: 377a3f555c -s ours am: 924897d2a8 -s ours am skip reason: Merged-In Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578 with SHA-1 35aef1ba39 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15546966 Change-Id: Ie673edf348722de577fd491efb27973d38456997
2021-08-13[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream ↵android-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseXin Li
am: 377a3f555c -s ours am skip reason: Merged-In Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578 with SHA-1 35aef1ba39 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15546966 Change-Id: I726f92bc13ec0f637e9e2f843d8544d72d11f64a
2021-08-13[automerger skipped] Merge ab/7633965 am: f656bd9b3c -s oursThe Android Open Source Project
am skip reason: Merged-In Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578 with SHA-1 35aef1ba39 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15547192 Change-Id: I1cbd22604c353066849ca8b23f96074928fbfdbe
2021-08-13Merge stage-aosp-sc-ts-dev before making it an upstreamXin Li
Bug: 169893837 Merged-In: Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578 Change-Id: I7359c0b3fb5ad0fddbbd2a2464d8a6fd8bb73348
2021-08-12Merge ab/7633965The Android Open Source Project
Bug: 169893837 Merged-In: Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578 Change-Id: I4504c8d9f844d632afe98ef51350fd7207a81397
2021-07-21Fixing stability of CallTest.cancelInFlightBeforeResponseReadThrowsIOE am: ↵Sorin Basca
35aef1ba39 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15337231 Change-Id: I18d8cc83b2aa1c569400eb303f13b9a61bd96e5c
2021-07-20Fixing stability of CallTest.cancelInFlightBeforeResponseReadThrowsIOEandroid12-devSorin Basca
The CallTest.cancelInFlightBeforeResponseReadThrowsIOE tests fail occasionally. It looks like a race condition between the cancel going through and the response message being handled from the client side. The test code has been updated to make the server-side hold off the response until the cancel is seen on the client-side. (cherry picked from commit 6bb2abab50a48217af33c9872ead82ba507f0ffa) Bug: 191957489 Test: atest CtsLibcoreOkHttpTestCases:com.squareup.okhttp.CallTest --iterations 1000 Merged-In: Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578 Change-Id: Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578
2021-07-16Fixing stability of headersOnlyStreamIsClosedAfterReplyHeaders am: 541335a930Sorin Basca
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15299577 Change-Id: I274a2312aa53a0a028884cbefe7b9c45415a5bed
2021-07-16Making the OkHttp internal framed tests more stable am: a40903c6d4Sorin Basca
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15299576 Change-Id: I9a3c9454a7c278d5fcb896306099511f88935fc6
2021-07-15Fixing stability of headersOnlyStreamIsClosedAfterReplyHeadersSorin Basca
Spdy3ConnectionTest.headersOnlyStreamIsClosedAfterReplyHeaders was occasionally failing. The error seems to be due to the fact that when a new stream is created, if only headers are exchanged and the exchange happens too quickly, then the stream is not marked as open, which causes the test to fail, as it expects an open stream after creation. This was fixed in upstream by removing the check that fails due to race conditions. See https://github.com/square/okhttp/commit/49dfda04ae9df1b915ccea17ca1e70ff48e06e6c (cherry picked from commit 9a853ef51ae582db4c7062d0410222379fb6e411) Bug: 191097565 Test: atest CtsLibcoreOkHttpTestCases: com.squareup.okhttp.internal.framed.Spdy3ConnectionTest --iterations 1000 Merged-In: Ic73d98407c617ea86bf4a6689109d55240043670 Change-Id: Ic73d98407c617ea86bf4a6689109d55240043670
2021-07-15Making the OkHttp internal framed tests more stableSorin Basca
The Spdy3ConnectionTest experienced some flakyness and inspecting it things could be improved. First of all the MockSpdyPeer.play() function was returning before the peer task executes, allowing room for race conditions. This has been fixed with the use of a CountDownLatch, so play() now waits for the task to start handling HTTP requests. Another potential problem is that tests would share the instance of MockSpdyPeer and rely on tearDown to clear any data, or resources. Tests have been updated to have their own instance of the class which gets auto-closed on test end. A last issue found is one where a listener would first provide an HTTP response before marking that the callback was received. This could cause a race condition as the main thread may start handling the response and checking if the callback was indeed received. It got fixed by first marking the callback and then providing the response. (cherry picked from commit 4291869755a4daebb5ec558e1b51f8d6080bb956) Bug: 191097565 Test: atest CtsLibcoreOkHttpTestCases --iterations 300 Test: atest CtsLibcoreOkHttpTestCases:com.squareup.okhttp.internal.framed.Spdy3ConnectionTest --iterations 300 Test: atest CtsLibcoreOkHttpTestCases:com.squareup.okhttp.internal.framed.Http2ConnectionTest --iterations 300 Merged-In: I88954f470d67299ff3c865a951e1ad91c7c8d1dd Change-Id: I88954f470d67299ff3c865a951e1ad91c7c8d1dd
2021-06-29Remove unused @CorePlatformApi and mark APIs in okhttp as @SystemApi am: ↵Victor Chang
381a66cc39 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15080381 Change-Id: Iaaabc524db49938862382c3e2f7d8dd67f3c5598
2021-06-28Remove unused @CorePlatformApi and mark APIs in okhttp as @SystemApiVictor Chang
Bug: 157639992 Bug: 154796679 Test: m update-api Merged-In: I9d570f00044ee0d0abbf1d867397f122afb22bdd Change-Id: I9d570f00044ee0d0abbf1d867397f122afb22bdd (cherry picked from commit 04fa37675e6192b75e8c404915205d9af24ddee8)
2021-06-24Document and @hide okhttp APIs am: 4be57c04a8Victor Chang
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15080380 Change-Id: I6c1d3385b11bf722016af6d8b2b477666e88138e
2021-06-23Document and @hide okhttp APIsVictor Chang
Bug: 154796679 Test: m droid Merged-In: I051ec677d0d70de61b6d58a4f37ec1e341250452 Change-Id: I051ec677d0d70de61b6d58a4f37ec1e341250452
2021-04-21[automerger skipped] Merge "[DO NOT MERGE] Update ConnectionSpecTest for ↵Anton Hansson
cipher suite removal" into pie-cts-dev am: d99a2fdd77 -s ours am: 6dcbbe57a2 -s ours am: 7255b1b7b4 -s ours am: 1f68b1e09a -s ours am: 1693fef6e3 -s ours am: 3c85fdbfcc -s ours am: d1fc3d5856 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1669936 Change-Id: I17810905f1fe5d6b3293c60a24acf9e91edb11b6
2021-04-21[automerger skipped] Merge "[DO NOT MERGE] Update ConnectionSpecTest for ↵Anton Hansson
cipher suite removal" into pie-cts-dev am: d99a2fdd77 -s ours am: 6dcbbe57a2 -s ours am: 7255b1b7b4 -s ours am: 1f68b1e09a -s ours am: 1693fef6e3 -s ours am: 08359cbbea -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1669936 Change-Id: I458634b0fdff00186c2a668c9ef93fa14243f71a
2021-04-21[automerger skipped] Merge "[DO NOT MERGE] Update ConnectionSpecTest for ↵Anton Hansson
cipher suite removal" into pie-cts-dev am: d99a2fdd77 -s ours am: 6dcbbe57a2 -s ours am: 7255b1b7b4 -s ours am: 1f68b1e09a -s ours am: 1693fef6e3 -s ours am: 3c85fdbfcc -s ours am skip reason: skip tag Change-Id I648b64dc77860bb758e09b6938d8f47a12c3a453 with SHA-1 68a1cc1e1f is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1669936 Change-Id: I15efe7ebfa0cec8eee1e0b08e2c54407a99d6c79
2021-04-21[automerger skipped] Merge "[DO NOT MERGE] Update ConnectionSpecTest for ↵Anton Hansson
cipher suite removal" into pie-cts-dev am: d99a2fdd77 -s ours am: 6dcbbe57a2 -s ours am: 7255b1b7b4 -s ours am: 1f68b1e09a -s ours am: 1693fef6e3 -s ours am skip reason: skip tag Change-Id I648b64dc77860bb758e09b6938d8f47a12c3a453 with SHA-1 68a1cc1e1f is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1669936 Change-Id: I455bf0d15c9c30cfe876fedb4e9a4d00ed7e2568
2021-04-21[automerger skipped] Merge "[DO NOT MERGE] Update ConnectionSpecTest for ↵Anton Hansson
cipher suite removal" into pie-cts-dev am: d99a2fdd77 -s ours am: 6dcbbe57a2 -s ours am: 7255b1b7b4 -s ours am: 1f68b1e09a -s ours am: 1693fef6e3 -s ours am skip reason: skip tag Change-Id I648b64dc77860bb758e09b6938d8f47a12c3a453 with SHA-1 68a1cc1e1f is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1669936 Change-Id: Id66ba8bff1c4c4c962cd4b8ead43e68833ad7a74
2021-04-21[automerger skipped] Merge "[DO NOT MERGE] Update ConnectionSpecTest for ↵Anton Hansson
cipher suite removal" into pie-cts-dev am: d99a2fdd77 -s ours am: 6dcbbe57a2 -s ours am: 7255b1b7b4 -s ours am: 1f68b1e09a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1669936 Change-Id: Ia3f123fe66567a10c5f67e4ed6ca6880ecbe28d8
2021-04-21[automerger skipped] Merge "[DO NOT MERGE] Update ConnectionSpecTest for ↵Anton Hansson
cipher suite removal" into pie-cts-dev am: d99a2fdd77 -s ours am: 6dcbbe57a2 -s ours am: 7255b1b7b4 -s ours am skip reason: skip tag Change-Id I648b64dc77860bb758e09b6938d8f47a12c3a453 with SHA-1 68a1cc1e1f is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1669936 Change-Id: I42e68afb1d1f11532b7f3b1b596287d4a9a46ea2
2021-04-21[automerger skipped] Merge "[DO NOT MERGE] Update ConnectionSpecTest for ↵Anton Hansson
cipher suite removal" into pie-cts-dev am: d99a2fdd77 -s ours am: 6dcbbe57a2 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1669936 Change-Id: Idd9de685bbc01b0713fd79c121f2c4d9e5d86792
2021-04-21[automerger skipped] Merge "[DO NOT MERGE] Update ConnectionSpecTest for ↵Anton Hansson
cipher suite removal" into pie-cts-dev am: d99a2fdd77 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1669936 Change-Id: I96c123b7e400d8b1e840a0d3867dd291557b3bb4
2021-04-21Merge "[DO NOT MERGE] Update ConnectionSpecTest for cipher suite removal" ↵pie-cts-devAnton Hansson
into pie-cts-dev
2021-04-20[DO NOT MERGE] Update ConnectionSpecTest for cipher suite removalAdam Vartanian
Cherry-pick note: Vendor is back-porting a later BoringSSL to Android 9 (in collaboration with Android Security and Privacy team) for certification purposes and so the cipher suite used in this test is removed as described below. Backporting this change will allow such devices to pass this test without affecting existing Android 9 devices. NB this change explicitly *does not* cherry-pick the StandardNames change in the same topic as that would then cause tests to fail on Android 9 devices with the original BoringSSL. We will address those failures separately. Original Change Description: BoringSSL has removed support for some old cipher suites, swap uses of them in tests for the related GCM cipher suites, which are still supported. Bug: 178993246 Test: cts -m CtsLibcoreTestCases Test: cts -m CtsLibcoreOkHttpTestCases Change-Id: I648b64dc77860bb758e09b6938d8f47a12c3a453 Merged-In: I648b64dc77860bb758e09b6938d8f47a12c3a453 (cherry picked from commit 68a1cc1e1f3a54fb47a0a5f99ceb35d6bfc480d3)
2021-04-20Merge "Add okhttp-for-host" am: 8d7d225cc1 am: 28e13e972a am: c8c7bb4417Paul Duffin
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1679614 Change-Id: Icdbe53bbd54f3fe3cef7de07e3d7e51f50f2e3c9
2021-04-20Merge "Add okhttp-for-host" am: 8d7d225cc1 am: 28e13e972aPaul Duffin
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1679614 Change-Id: I7bc7b9714f9568f915255effec8fd54c2d222ebc
2021-04-20Merge "Add okhttp-for-host" am: 8d7d225cc1Paul Duffin
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1679614 Change-Id: I8475825b448ed3b4e3a634c42dc5964de22373bc
2021-04-20Merge "Add okhttp-for-host"android-s-beta-2android-s-beta-1Paul Duffin
2021-04-19Add okhttp-for-hostPaul Duffin
For use by robolectric. Bug: 185789034 Test: m robolectric_android-all-device-deps layoutlib Change-Id: I93d8f68578157ed2fa345e993c5cf3a978e0ef02
2021-03-17Merge "Make okhttp implementation source files available for libcore" am: ↵Paul Hu
d6206694e3 am: 6a44d6ede6 am: 80ddd786c0 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1622890 Change-Id: Ia6dba13ab6a578a6565749e68da23598b49d8899
2021-03-16Merge "Make okhttp implementation source files available for libcore" am: ↵temp_ab_7272582Paul Hu
d6206694e3 am: 6a44d6ede6 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1622890 Change-Id: I4cb6e324b259368ecf05b6600244a12fb64486ec
2021-03-16Merge "Make okhttp implementation source files available for libcore" am: ↵Paul Hu
d6206694e3 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1622890 Change-Id: Ifa0db7610a1a2eabf324997b4f8afb4a69a04787
2021-03-16Merge "Make okhttp implementation source files available for libcore"Paul Hu
2021-03-09Make okhttp implementation source files available for libcorePaul Duffin
Bug: 182238821 Test: m update-api Change-Id: Ib5c8490eb756edc8ce3ef21e7104bd1c2349b0c9
2021-03-04Merge "Add min_sdk_version for ART module." am: 502b3afc7b am: c254c8546a ↵Nicolas Geoffray
am: 4d49a34cec Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1614809 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I21f7c93d01a795344a0e485d242abf75e989768d
2021-03-04Merge "Add min_sdk_version for ART module." am: 502b3afc7b am: c254c8546aNicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1614809 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9f5b0c9bb3a14aebdbf779fb4a6e510a18987c68
2021-03-04Merge "Add min_sdk_version for ART module." am: 502b3afc7bNicolas Geoffray
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1614809 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2bd08361d0844eb86d7e14e38eec7845ccf7cf2d
2021-03-04Merge "Add min_sdk_version for ART module."Nicolas Geoffray
2021-03-03Add min_sdk_version for ART module.Nicolas Geoffray
Bug: 180399951 Test: m Change-Id: I22b62d3d41078204b637bf246542049aa8ee6147
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: a73a9bbd28 -s ↵Xin Li
ours am: 9cd9ac5a2e -s ours am skip reason: Change-Id I3d424b834464b3588140a96418f98830921704b8 with SHA-1 151db5b13c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifd4b0264062bc5eab0963faad214c6fd5a39ac5a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: a73a9bbd28 -s oursXin Li
am skip reason: Change-Id I3d424b834464b3588140a96418f98830921704b8 with SHA-1 151db5b13c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2f387bde979f2b7217fc500a83ca3ef009805742
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I3d424b834464b3588140a96418f98830921704b8 Change-Id: I3000ca142952a2ca76bd2c9f84aa1bf22d616ad0
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/okhttp" am: 5dc27fcd5e am: ↵Bob Badour
0dc23b66e2 am: 724428756e Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1588887 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I67f037142dcc898ba75de64d81b8a76654268594
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/okhttp" am: 5dc27fcd5e am: ↵Bob Badour
0dc23b66e2 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1588887 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibb4991505b711cee0c35d794076d37dc072f5074
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/okhttp" am: 5dc27fcd5eBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1588887 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I665b3c69f2be628b02da0235b8e290b64a4e62e2
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/okhttp"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/okhttpBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I7aba570afa4bcc24f5308d444c755e875c13693f
2021-02-04[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT ↵Bill Yi
MERGE" am: 15f30f1332 -s ours am: 0ae8da0ec6 -s ours am: c9bfa81845 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1573484 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic87f4314e8e7b7aaed4b43aa7d500920b6b12431
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 23:49:26 +0000