From 6189154d5fef04545244d8669bbcbfd8608450ee Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Tue, 9 Mar 2010 21:57:30 -0500 Subject: Don't try to purge the dalvik-cache directory on /cache. --- src/com/android/providers/downloads/Constants.java | 3 +++ src/com/android/providers/downloads/DownloadService.java | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/com/android/providers/downloads/Constants.java b/src/com/android/providers/downloads/Constants.java index 5cf13531..7cfe6bcf 100644 --- a/src/com/android/providers/downloads/Constants.java +++ b/src/com/android/providers/downloads/Constants.java @@ -88,6 +88,9 @@ public class Constants { /** A magic filename that is allowed to exist within the system cache */ public static final String RECOVERY_DIRECTORY = "recovery"; + /** A magic filename that is allowed to exist within the system cache */ + public static final String DEX_CACHE_DIRECTORY = "dalvik-cache"; + /** The default user agent used for downloads */ public static final String DEFAULT_USER_AGENT = "AndroidDownloadManager"; diff --git a/src/com/android/providers/downloads/DownloadService.java b/src/com/android/providers/downloads/DownloadService.java index 169ef970..2d87b80e 100644 --- a/src/com/android/providers/downloads/DownloadService.java +++ b/src/com/android/providers/downloads/DownloadService.java @@ -430,10 +430,10 @@ public class DownloadService extends Service { } HashSet fileSet = new HashSet(); for (int i = 0; i < files.length; i++) { - if (files[i].getName().equals(Constants.KNOWN_SPURIOUS_FILENAME)) { - continue; - } - if (files[i].getName().equalsIgnoreCase(Constants.RECOVERY_DIRECTORY)) { + String filename = files[i].getName(); + if (Constants.KNOWN_SPURIOUS_FILENAME.equals(filename) || + Constants.RECOVERY_DIRECTORY.equalsIgnoreCase(filename) || + Constants.DEX_CACHE_DIRECTORY.equalsIgnoreCase(filename)) { continue; } fileSet.add(files[i].getPath()); -- cgit v1.2.3