summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/CacheManager.java
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-08-06 18:44:02 -0700
committerGrace Kloba <klobag@google.com>2009-08-06 18:44:02 -0700
commitbf951c5afdae020befac8099a9e13a851d26863c (patch)
tree9eea91ed4ceecdb64f9316eba2b274c3a6629cc8 /core/java/android/webkit/CacheManager.java
parent6bfe14dea21deec4c90ceea79b8f810164f88031 (diff)
As createCacheFile is called from WebCore instead of http thread now, remove
the endCacheTransaction/startTransaction pairs.
Diffstat (limited to 'core/java/android/webkit/CacheManager.java')
-rw-r--r--core/java/android/webkit/CacheManager.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/core/java/android/webkit/CacheManager.java b/core/java/android/webkit/CacheManager.java
index 9a02fbeecc0a..7b32a262ce49 100644
--- a/core/java/android/webkit/CacheManager.java
+++ b/core/java/android/webkit/CacheManager.java
@@ -534,12 +534,7 @@ public final class CacheManager {
// cache file. If it is not, resolve the collision.
while (file.exists()) {
if (checkOldPath) {
- // as this is called from http thread through
- // createCacheFile, we need endCacheTransaction before
- // database access.
- WebViewCore.endCacheTransaction();
CacheResult oldResult = mDataBase.getCache(url);
- WebViewCore.startCacheTransaction();
if (oldResult != null && oldResult.contentLength > 0) {
if (path.equals(oldResult.localPath)) {
path = oldResult.localPath;