Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove some superfluous null-checks when constructing a CacheResult" into honeycomb

Browse Source
This commit is contained in:
Steve Block
2011-01-07 06:12:08 -08:00
committed by Android (Google) Code Review
parent a270bd59a8 7a1121511d
commit 5f6bcc17e9
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/webkit/CacheManager.java
View File

@@ -734,8 +734,7 @@ public final class CacheManager {
CacheResult ret = new CacheResult();
ret.httpStatusCode = statusCode;
String location = headers.getLocation();
if (location != null) ret.location = location;
ret.location = headers.getLocation();
ret.expires = -1;
ret.expiresString = headers.getExpires();
@@ -754,15 +753,9 @@ public final class CacheManager {
}
}
String contentDisposition = headers.getContentDisposition();
if (contentDisposition != null) {
ret.contentdisposition = contentDisposition;
}
ret.contentdisposition = headers.getContentDisposition();
String crossDomain = headers.getXPermittedCrossDomainPolicies();
if (crossDomain != null) {
ret.crossDomain = crossDomain;
}
ret.crossDomain = headers.getXPermittedCrossDomainPolicies();
// lastModified and etag may be set back to http header. So they can't
// be empty string.
@@ -772,7 +765,9 @@ public final class CacheManager {
}
String etag = headers.getEtag();
if (etag != null && etag.length() > 0) ret.etag = etag;
if (etag != null && etag.length() > 0) {
ret.etag = etag;
}
String cacheControl = headers.getCacheControl();
if (cacheControl != null) {