diff options
author | Ficus Kirkpatrick <ficus@android.com> | 2014-06-25 00:28:50 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-25 00:28:50 +0000 |
commit | b3b7e68078c4579f11c1c559f027f4edde70bdc9 (patch) | |
tree | 7b2b18dacacfdc884346e4c763a871a5fdfcf348 | |
parent | eafdc0ceab8589c108fe60add8c0377e4481d863 (diff) | |
parent | 6ccd708adf345337137a7ef8efa6fd618afa7bc4 (diff) | |
download | volley-b3b7e68078c4579f11c1c559f027f4edde70bdc9.tar.gz |
am 6ccd708a: am 0e406003: Merge "Fix crash/OOM in DiskBasedCache"android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-release
* commit '6ccd708adf345337137a7ef8efa6fd618afa7bc4':
Fix crash/OOM in DiskBasedCache
-rw-r--r-- | src/com/android/volley/toolbox/DiskBasedCache.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/volley/toolbox/DiskBasedCache.java b/src/com/android/volley/toolbox/DiskBasedCache.java index 2a4761b..d397aad 100644 --- a/src/com/android/volley/toolbox/DiskBasedCache.java +++ b/src/com/android/volley/toolbox/DiskBasedCache.java @@ -61,7 +61,7 @@ public class DiskBasedCache implements Cache { private static final float HYSTERESIS_FACTOR = 0.9f; /** Magic number for current version of cache file format. */ - private static final int CACHE_MAGIC = 0x20120504; + private static final int CACHE_MAGIC = 0x20140623; /** * Constructs an instance of the DiskBasedCache at the specified directory. @@ -197,7 +197,12 @@ public class DiskBasedCache implements Cache { try { FileOutputStream fos = new FileOutputStream(file); CacheHeader e = new CacheHeader(key, entry); - e.writeHeader(fos); + boolean success = e.writeHeader(fos); + if (!success) { + fos.close(); + VolleyLog.d("Failed to write header for %s", file.getAbsolutePath()); + throw new IOException(); + } fos.write(entry.data); fos.close(); putEntry(key, e); |