diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-03-09 21:57:30 -0500 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-06-24 02:50:13 -0400 |
| commit | 0ac16ba8432a459dbccf23ff28521ca808a104a8 (patch) | |
| tree | 1ba23ce9761d3cab36630da4314ea255c898254d | |
| parent | fbe18a4c8d357a93f3add12bc01afe8ad6ea54c6 (diff) | |
| download | android_packages_providers_DownloadProvider-0ac16ba8432a459dbccf23ff28521ca808a104a8.tar.gz android_packages_providers_DownloadProvider-0ac16ba8432a459dbccf23ff28521ca808a104a8.tar.bz2 android_packages_providers_DownloadProvider-0ac16ba8432a459dbccf23ff28521ca808a104a8.zip | |
Don't try to purge the dalvik-cache directory on /cache.
| -rw-r--r-- | src/com/android/providers/downloads/Constants.java | 3 | ||||
| -rw-r--r-- | 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 9e890ea0..329d2c57 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()); |