summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2010-03-09 21:57:30 -0500
committerSteve Kondik <shade@chemlab.org>2010-03-09 21:57:30 -0500
commite29a087959d7070d7552f113937905612f16d74f (patch)
treede06ff2addc8bb8e32f484357c25d88790f123d5 /src/com/android
parent7f75be7ea7027a2ad6e7564195333fd075c0b1a0 (diff)
downloadandroid_packages_providers_DownloadProvider-e29a087959d7070d7552f113937905612f16d74f.tar.gz
android_packages_providers_DownloadProvider-e29a087959d7070d7552f113937905612f16d74f.tar.bz2
android_packages_providers_DownloadProvider-e29a087959d7070d7552f113937905612f16d74f.zip
Don't try to purge the dalvik-cache directory on /cache.
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/providers/downloads/Constants.java3
-rw-r--r--src/com/android/providers/downloads/DownloadService.java8
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 a246d29f..36e8eb09 100644
--- a/src/com/android/providers/downloads/DownloadService.java
+++ b/src/com/android/providers/downloads/DownloadService.java
@@ -482,10 +482,10 @@ public class DownloadService extends Service {
}
HashSet<String> 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());