| 757558d44f11770d9d7710f6811d6bd784fc98d7 |
|
19-Oct-2016 |
Tobias Thierer <tobiast@google.com> |
Apply: Recover more gracefully when an editor is detached.
Backport upstream commit aae1a45bcb6dd2ffd3b0b87525bbef4e4517ddba
An app reported crashes whose stacktrace appears to match upstream
bug https://github.com/square/okhttp/issues/2420
Therefore this CL is backporting the corresponding fix.
Bug: 31823815
Test: mvn clean verify
Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Original commit message follows:
We had a bug where we could have two editors for the same entry. This
would occur when the cache was cleared, or if the entry was otherwise
evicted while the edit was in progress.
Previously the two editors would corrupt each other, and potentially
the cache's size. With this change the detached editor is limited and
harmless.
Change-Id: I56e3a27187f2df025c99916daed24acc63d589d3
/external/okhttp/okhttp/src/main/java/com/squareup/okhttp/internal/DiskLruCache.java
|
| 71b9f47b26fb57ac3e436a19519c6e3ec70e86eb |
|
16-Sep-2015 |
Neil Fuller <nfuller@google.com> |
Pull latest code from upstream okhttp and okio
This change contains the OkHttp and Okio changes without
modification. The only additions are the
MODULE_LICENSE_APACHE2 files.
This corresponds closely to OkHttp 2.5.0 and
Okio 1.6.0. Behavior changes are documented in
CHANGELOG.md.
This change does not compile as is. The next
commit makes the Android modifications required.
okhttp: 4305dc3fabeab392eb56f2db51538e06c3a54e51
okio: 313436764bf35794e158c6171e319fee868298df
Change-Id: I97ce07ff0472cdbce09f588863a1e5ccdcea0c20
/external/okhttp/okhttp/src/main/java/com/squareup/okhttp/internal/DiskLruCache.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/src/main/java/com/squareup/okhttp/internal/DiskLruCache.java
|
| e78f117bcbd6b57d783737107f445ef75ecb474a |
|
20-Jan-2015 |
Neil Fuller <nfuller@google.com> |
Pull latest OkHttp code from upstream
okio:
okio is now managed upstream as a separate project but has
been included here as a sub directory: the okio version here
is intended only for use with OkHttp.
okio is synced to upstream commit
82358df7f09e18aa42348836c614212085bbf045.
See okio/README.android for local changed needed to make it
compile.
okhttp:
This is effectively an upgrade from a snapshot close to
OkHttp 1.5 with Android additions to a snapshot close to
OkHttp 2.2.
okhttp was synced to upstream commit
0a197466608681593cc9be9487965a0b1d5c244c
See README.android for local changes needed to make it
compile.
Most of the old Android changes have been pushed upstream
and other upstream changes have been made to keep OkHttp
working on Android.
TLS fallback changes have not been upstreamed yet:
bcce0a3d26d66d33beb742ae2adddb3b7db5ad08
ede2bf1af0917482da8ccb7b048130592034253d
This means that some CTS tests will start to fail. A later
commit will fix those changes when it has been accepted
upstream.
There are associated changes in libcore and frameworks/base.
Change-Id: I0a68b27b1ec7067be452671bc591edfd84e310f2
/external/okhttp/okhttp/src/main/java/com/squareup/okhttp/internal/DiskLruCache.java
|
| c6bd683320121544811f481709b3fdbcbe9b3866 |
|
14-Mar-2014 |
Neil Fuller <nfuller@google.com> |
Upgrade OkHttp to newer code
This update includes changes up to
68affbd24d63620e1785ea847f1936760947b9ae / master /
14th March 2014.
Importantly, it contains a DiskLruCache fix which
broke several apps.
https://github.com/square/okhttp/issues/646
Change-Id: I8a489e6d0937a58fad10423154bad939ea4da868
/external/okhttp/okhttp/src/main/java/com/squareup/okhttp/internal/DiskLruCache.java
|
| 3c938a3f6b61ce5e2dba0d039b03fe73b89fd26c |
|
19-Feb-2014 |
Neil Fuller <nfuller@google.com> |
Update okhttp to a more recent commit.
Updating to upstream commit : 7b106923e078ac2435e8c8ce9d615f9903106ed8
/ 7th Mar 2014 / main branch.
The following changes were made to Android-only code:
1) HttpsHandler has been changed to deal with the fix for:
https://github.com/square/okhttp/issues/184 (commit 5d7fdba).
2) Platform.java changed to accomodate changes in okhttp Platform
method signatures.
3) .mk file updates to reflect src directory changes.
The following changes were made to OkHttp code:
1) Removal of org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
annotation from okio/src/main/java/okio/DeflaterSink.java
Change-Id: I644a883482ac7ee7d029785f110a2ca00762419b
/external/okhttp/okhttp/src/main/java/com/squareup/okhttp/internal/DiskLruCache.java
|
| 166772be0e5cfdaea1a64b9f63e4c8dbfe48cba3 |
|
04-Nov-2013 |
Narayan Kamath <narayan@google.com> |
Update okhttp.
Updated to commit 19a21936ffbb5e358799af9e4fb7306af45f38.
This also moves src/ to okhttp/src/ to stay faithful
to the original okhttp tree & to make it easier to pull
updates.
Change-Id: Ia1971823f31e5c6957d831f368e3a1fcce38d44d
/external/okhttp/okhttp/src/main/java/com/squareup/okhttp/internal/DiskLruCache.java
|