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

am 7450a32b: Merge "Clear the files we copy over to the temp cache" into honeycomb

Browse Source 
* commit '7450a32bab8945738589d7b323953cdc80de111f':
  Clear the files we copy over to the temp cache
This commit is contained in:
Kristian Monsen
2011-01-20 06:37:24 -08:00
committed by Android Git Automerger
parent 10ce547f1c 7450a32bab
commit 6e8831cf2d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,6 +244,9 @@ public final class CacheManager {
* obtained from {@link android.webkit.CacheManager.CacheResult#getLocalPath}, this * obtained from {@link android.webkit.CacheManager.CacheResult#getLocalPath}, this
* identifies the cache file. * 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. * @return File The base directory of the cache.
* *
* @deprecated Access to the HTTP cache will be removed in a future release. * @deprecated Access to the HTTP cache will be removed in a future release.
@@ -611,8 +614,9 @@ public final class CacheManager {
return true; return true;
} }
// delete rows in the cache database // delete rows in the cache database
WebViewWorker.getHandler().sendEmptyMessage( if (!JniUtil.useChromiumHttpStack())
WebViewWorker.MSG_CLEAR_CACHE); WebViewWorker.getHandler().sendEmptyMessage(WebViewWorker.MSG_CLEAR_CACHE);
// delete cache files in a separate thread to not block UI. // delete cache files in a separate thread to not block UI.
final Runnable clearCache = new Runnable() { final Runnable clearCache = new Runnable() {
public void run() { public void run() {

2
core/java/android/webkit/WebViewCore.java
View File

@@ -1770,7 +1770,7 @@ final class WebViewCore {
private void clearCache(boolean includeDiskFiles) { private void clearCache(boolean includeDiskFiles) {
mBrowserFrame.clearCache(); mBrowserFrame.clearCache();
if (includeDiskFiles && !JniUtil.useChromiumHttpStack()) { if (includeDiskFiles) {
CacheManager.removeAllCacheFiles(); CacheManager.removeAllCacheFiles();
} }
} }