cf362b8db836b1752eb90f7c64fb1d71c4744144 |
|
24-Jun-2016 |
Tobias Thierer <tobiast@google.com> |
Android modifications to existing files from OkHttp / okio This CL contains all changes to existing files that were previously introduced by AOSP commit 36132b3cd2c814e057c775adc821ae0fb12aeb4c In addition, this CL adds assertNotEquals() to RealWebSocketTest.java to make it run on AOSP's version of JUnit. This commit reverts all of the changes to okio from the previous CL *except* for slight tweaks to README.android. Change-Id: Ia6c8c3ae33573f8bb3bfd638376f1421286472b2
/external/okhttp/okhttp-ws-tests/src/test/java/com/squareup/okhttp/internal/ws/RealWebSocketTest.java
|
6c251e20f00c7574b217bd4351ac81666f574380 |
|
24-Jun-2016 |
Tobias Thierer <tobiast@google.com> |
Update OkHttp to 2.7.5 and advance okio by one commit. This brings OkHttp and okio exactly in line with upstream commits with no local changes. Corresponding upstream commits: okhttp:6e236ce3b80f21369dc544f0e1053ff71be8689b (= parent-2.7.5) okio: 02481cc0cc84bc92e3eab6d5212a226496f56a7e The okio commit differs from the one in the previous pull from Sep 2015 (AOSP commit 71b9f47b26fb57ac3e436a19519c6e3ec70e86eb) only by a single upstream commit, the switch to 8 KiB segments. That commit was previously cherry-picked in AOSP. This CL will temporarily revert the AOSP changes to okio, but those AOSP changes to okio will be reapplied in the subsequent CL. Compilation and tests do not pass after this CL, they will only pass at the end of the chain of 11 CLs going in at the same time. 9 of these 11 CLs are in external/okhttp, the others affect libcore and frameworks/base. Details of behavioural changes introduced by this upgrade are at: https://docs.google.com/document/d/19PF3Exd_q32gAGCiRFWRf0Pq_xrIWs-cRViHkFTxJg8/edit This CL includes files that are not used in Android, such as - top level dot files (.travis.yml etc.) - subdirectories okurl, okhttp-apache, samples, which aren't used - tests in okhttp-hpacktests, okhttp-ws-tests that aren't run or test functionality that we aren't used Test: I've run the following tests *at the end* of the chain of commits, in cts-tradefed: 1.) run cts -p android.core.tests.libcore.package.harmony_java_net 2.) run cts -c libcore.java.net.URLConnectionTest 3.) run cts -p android.core.tests.libcore.package.okhttp 4.) run cts -p android.core.tests.libcore.package.libcore 1.-3.) all passed 4.) had 24 unrelated failures per b/29496407 and b/29744850 Change-Id: Id798d6cf49fa4a7a4ab8ae3b699a38104bf42db3
/external/okhttp/okhttp-ws-tests/src/test/java/com/squareup/okhttp/internal/ws/RealWebSocketTest.java
|
7aeaaefc891f6221f4b2cce536b1c1e816e09794 |
|
07-May-2015 |
Neil Fuller <nfuller@google.com> |
Rollup of upstream OkHttp and Okio changes OkHttp from: b5811711b141b230e4e58f577c79cfbf4c2d4028 to: 3c61fdb2ba9d1ebe0419b93cfbd4e94ffc857fe3 Okio from: b40f99a950cb407eff52537a97420bd253a64f63 to: b76b6903ef05546c5aef249ea6b2b679bc43094b Both "to" are head as of 20150505. Patches applied cleanly without conflicts except for okio/okio/src/test/java/okio/BufferedSourceTest.java which has local Android changes to account for Android CTS only supporting Junit 4.10. There are various changes included most of which will not affect Android. OkHttp changes of note for Android: 1) Improvements to TLS negotiation. Upstream commit 60f5406dcc094d0431420139bd002e8bdd4ea5d5 https://github.com/square/okhttp/pull/1388 2) Fix for CTS tests on Android. Upstream commit fb155c47661ede5da395dfb4e620867263b8c8e7 https://github.com/square/okhttp/pull/1555 3) Switch to using Okio for form URL encoding Upstream commit 2a4c1f288d284d3266b5aec4decb167a3af0a976 https://github.com/square/okhttp/pull/1563 4) Fix Vary caching on Android. Upstream commit b7baf23d86305762ea4e42adc4054c0840eca5ca https://github.com/square/okhttp/pull/1590 5) Report some TLS issues during negotiation (not all) Upstream commit 71ead1911be28c1cae1eef765abf23724b776981 https://github.com/square/okhttp/pull/1596 Okio changes of note for Android: 1) Fix for truncated GZIP streams Upstream commit 3e25d85bc4ad3c6f1622b0438b3976804958fbfb https://github.com/square/okhttp/issues/1540 Additional android-specific changes: Suppress a new test that requires JUnit 4.11 and Gson in the Android.mk file. Change-Id: I98ed1cc1debf7e03c5895bec38ea5cf9e402b144
/external/okhttp/okhttp-ws-tests/src/test/java/com/squareup/okhttp/internal/ws/RealWebSocketTest.java
|
a2cab72aa5ff730ba2ae987b45398faafffeb505 |
|
13-Apr-2015 |
Neil Fuller <nfuller@google.com> |
Roll-up of upstream OkHttp and Okio changes OkHttp: From b609edd07864d7191dcda8ba1f6c833c9fe170ad to b40f99a950cb407eff52537a97420bd253a64f63 Okio: From 654ddf5e8f6311fda77e429c22d5e0e15f713b8d to b5811711b141b230e4e58f577c79cfbf4c2d4028 Both "to" are head as of 20150413. Patches applied cleanly without conflicts. This submission will break some CTS tests due to https://github.com/square/okhttp/issues/1552 Solutions will be made upstream and patched in. The CTS tests broken are related to SPDY/HTTP2 which are not used by Android's embedded OkHttp. Change-Id: I84d55b6f5c8dbc05148e86bd9421a2c393b563d4
/external/okhttp/okhttp-ws-tests/src/test/java/com/squareup/okhttp/internal/ws/RealWebSocketTest.java
|