summaryrefslogtreecommitdiffstats
path: root/src/com/android/providers
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-07-01 15:27:28 -0700
committerJean-Baptiste Queru <jbq@google.com>2009-07-02 09:48:50 -0700
commitf0fa1cdc1a36cbe0abd57ef9cf9a636fd1d3e2c8 (patch)
treeac5dbc5660c3b95cdba814e82bd1700d436c8436 /src/com/android/providers
parent3c700a35be5ec8c4036e75abebf0e5d4bc878eff (diff)
downloadandroid_packages_providers_DownloadProvider-f0fa1cdc1a36cbe0abd57ef9cf9a636fd1d3e2c8.tar.gz
android_packages_providers_DownloadProvider-f0fa1cdc1a36cbe0abd57ef9cf9a636fd1d3e2c8.tar.bz2
android_packages_providers_DownloadProvider-f0fa1cdc1a36cbe0abd57ef9cf9a636fd1d3e2c8.zip
Fix crash in discardPurgeableFiles with proper selection syntax.
The basic crash is that this codepath was doing a query to the download provider without properly quoting its selection arguments (which is mandated by the download provider). A secondary crash is that the DESTINATION column wasn't readable. This fixes bug 1941125. Tested by force-calling discardPurgeableFiles for each download to /cache, locally adding a few debugging statements to be sure that the codepath was getting executed, and doing a market download.
Diffstat (limited to 'src/com/android/providers')
-rw-r--r--src/com/android/providers/downloads/DownloadProvider.java1
-rw-r--r--src/com/android/providers/downloads/Helpers.java6
2 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java
index f7cdd51e..e5f25762 100644
--- a/src/com/android/providers/downloads/DownloadProvider.java
+++ b/src/com/android/providers/downloads/DownloadProvider.java
@@ -82,6 +82,7 @@ public final class DownloadProvider extends ContentProvider {
Downloads._DATA,
Downloads.MIMETYPE,
Downloads.VISIBILITY,
+ Downloads.DESTINATION,
Downloads.CONTROL,
Downloads.STATUS,
Downloads.LAST_MODIFICATION,
diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java
index 7c6070f3..72be60ed 100644
--- a/src/com/android/providers/downloads/Helpers.java
+++ b/src/com/android/providers/downloads/Helpers.java
@@ -427,9 +427,9 @@ public class Helpers {
Downloads.CONTENT_URI,
null,
"( " +
- Downloads.STATUS + " = " + Downloads.STATUS_SUCCESS + " AND " +
- Downloads.DESTINATION + " = " + Downloads.DESTINATION_CACHE_PARTITION_PURGEABLE
- + " )",
+ Downloads.STATUS + " = '" + Downloads.STATUS_SUCCESS + "' AND " +
+ Downloads.DESTINATION + " = '" + Downloads.DESTINATION_CACHE_PARTITION_PURGEABLE
+ + "' )",
null,
Downloads.LAST_MODIFICATION);
if (cursor == null) {