aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-08-18Snap for 7652919 from 0447f60a5216634377ccb32abef4475edabdee7d to ↵android-mainline-12.0.0_r90android-mainline-12.0.0_r76android-mainline-12.0.0_r48android-mainline-12.0.0_r31android-mainline-12.0.0_r121android-mainline-12.0.0_r11android-mainline-12.0.0_r106aml_mpr_311911090android12-mainline-mediaprovider-releaseAndroid Build Coastguard Worker
mainline-mediaprovider-release Change-Id: I0fe34828198ad64cc9c84dfb6bba2038f938e47f
2021-08-13[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r49android-mainline-12.0.0_r122android-mainline-12.0.0_r100android12-mainline-networkstack-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: I1b176707928e4a8c35287b7e1e535c4af3915229
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-22Snap for 7574095 from de3d45d459afc583073a22f3bd9528b1e17bf928 to ↵Android Build Coastguard Worker
mainline-mediaprovider-release Change-Id: Ib53fe3ce4c36ef59b7bc022f30a029ae4f1d4fa7
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: I999eb61751b58c7174603408607fbf5c14a69899
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: I4460c2134752d229e2e9cca7732a1dd79b9858d8
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: I4408fe98998dd76434758ca585982d6f7a4d4d39
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-07-01Snap for 7514173 from 6bca65986c02f8a444fa3670b6455773d84885e4 to ↵Android Build Coastguard Worker
mainline-mediaprovider-release Change-Id: I73e04d4136af513d10c5b140554d26ceb5bb872d
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: I49a5409ca5a86a5edf0b5ca7aa5d7dd6dc736014
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-24Snap for 7490158 from 8bcc83203bda526d453ddd06336abcc722df001c to ↵Android Build Coastguard Worker
mainline-mediaprovider-release Change-Id: Ib094914059d2b9dc048a0e7620d2861276f481df
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: Ia20e31a9c38799386c10b3ec05ee7a2106c3bcea
2021-06-23Document and @hide okhttp APIsVictor Chang
Bug: 154796679 Test: m droid Merged-In: I051ec677d0d70de61b6d58a4f37ec1e341250452 Change-Id: I051ec677d0d70de61b6d58a4f37ec1e341250452
2021-06-17Snap for 7468467 from a83f66d1919528aef48c1d0b09436149f0441ff5 to ↵android-build-team Robot
mainline-mediaprovider-release Change-Id: I4839e11d4e0bb8c8a8fc399380df832d322cddf5
2021-04-23Snap for 7308103 from 08359cbbea277b32b3c943328206efe07d7cd58e to ↵android-build-team Robot
mainline-mediaprovider-release Change-Id: I379ba15109cb73d735b3a3b13a1c887d6eedb598
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: f96f3d20e1 -s ours am skip reason: skip tag Change-Id I648b64dc77860bb758e09b6938d8f47a12c3a453 with SHA-1 81c69c6827 is already in history Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1669936 Change-Id: I089b7240bc92350b35afc1e4577b0a988d7e0280
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: 512a40c4d0 -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: Ib9648960ebeafaa9e8d93a4fd8c9dd86e21a1649
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: c8c7bb4417 am: ↵Paul Duffin
4d77777b9a Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1679614 Change-Id: I21da4e2fb3e1202677dea1e03266327434d769cb
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 am: 17fa1abc9d Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1622890 Change-Id: Ib4c81b381aaab9600b9b75a1a93d771fdae3b794
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 am: 1410da3b03 Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/1614809 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3c15fb727142f5e75982e1f4afa3f6887b749c4c
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 16:15:38 +0000