Automated import from //branches/master/...@142846,142846

This commit is contained in:
Grace Kloba
2009-03-25 20:05:44 -07:00
committed by The Android Open Source Project
parent 82a0c4615e
commit 52cf58a2a4

View File

@@ -52,7 +52,6 @@ public final class CacheManager {
private static final String NO_STORE = "no-store";
private static final String NO_CACHE = "no-cache";
private static final String PRIVATE = "private";
private static final String MAX_AGE = "max-age";
private static long CACHE_THRESHOLD = 6 * 1024 * 1024;
@@ -629,7 +628,7 @@ public final class CacheManager {
// must be re-validated on every load. It does not mean that
// the content can not be cached. set to expire 0 means it
// can only be used in CACHE_MODE_CACHE_ONLY case
if (NO_CACHE.equals(controls[i]) || PRIVATE.equals(controls[i])) {
if (NO_CACHE.equals(controls[i])) {
ret.expires = 0;
} else if (controls[i].startsWith(MAX_AGE)) {
int separator = controls[i].indexOf('=');