From f0fa1cdc1a36cbe0abd57ef9cf9a636fd1d3e2c8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Wed, 1 Jul 2009 15:27:28 -0700 Subject: 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. --- src/com/android/providers/downloads/DownloadProvider.java | 1 + src/com/android/providers/downloads/Helpers.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') 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) { -- cgit v1.2.3