diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-01-20 06:40:08 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-20 06:40:08 -0800 |
| commit | 28f37efe309d51c877bdd8c5ac31946db3ff06e4 (patch) | |
| tree | f2c6763667f3f0fbf9072bf382464707cc3e2edd /core/java/android/webkit/CacheManager.java | |
| parent | 8db90d63116e7d5aef41eea1e11ed073ea440d31 (diff) | |
| parent | 6e8831cf2d7fd90ab124f58a9fc1919fac818887 (diff) | |
am 6e8831cf: am 7450a32b: Merge "Clear the files we copy over to the temp cache" into honeycomb
* commit '6e8831cf2d7fd90ab124f58a9fc1919fac818887':
Clear the files we copy over to the temp cache
Diffstat (limited to 'core/java/android/webkit/CacheManager.java')
| -rw-r--r-- | core/java/android/webkit/CacheManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/webkit/CacheManager.java b/core/java/android/webkit/CacheManager.java index 125a9c0ae947..527a1869baa5 100644 --- a/core/java/android/webkit/CacheManager.java +++ b/core/java/android/webkit/CacheManager.java @@ -246,6 +246,9 @@ public final class CacheManager { * obtained from {@link android.webkit.CacheManager.CacheResult#getLocalPath}, this * identifies the cache file. * + * Cache files are not guaranteed to be in this directory before + * CacheManager#getCacheFile(String, Map<String, String>) is called. + * * @return File The base directory of the cache. * * @deprecated Access to the HTTP cache will be removed in a future release. @@ -613,8 +616,9 @@ public final class CacheManager { return true; } // delete rows in the cache database - WebViewWorker.getHandler().sendEmptyMessage( - WebViewWorker.MSG_CLEAR_CACHE); + if (!JniUtil.useChromiumHttpStack()) + WebViewWorker.getHandler().sendEmptyMessage(WebViewWorker.MSG_CLEAR_CACHE); + // delete cache files in a separate thread to not block UI. final Runnable clearCache = new Runnable() { public void run() { |