diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-07-06 10:42:56 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-07-06 10:42:56 -0700 |
| commit | 4ed4c65f46f5d077bb40f82e7a4821bd47217fdd (patch) | |
| tree | b9cea6599284f2330ed96516317550664144089d /src | |
| parent | 942f86951acec0850fd0f75909f2dee72fa490d1 (diff) | |
| parent | f0fa1cdc1a36cbe0abd57ef9cf9a636fd1d3e2c8 (diff) | |
| download | android_packages_providers_DownloadProvider-4ed4c65f46f5d077bb40f82e7a4821bd47217fdd.tar.gz android_packages_providers_DownloadProvider-4ed4c65f46f5d077bb40f82e7a4821bd47217fdd.tar.bz2 android_packages_providers_DownloadProvider-4ed4c65f46f5d077bb40f82e7a4821bd47217fdd.zip | |
Merge commit 'f0fa1cdc' into manualmerge
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.
Conflicts:
src/com/android/providers/downloads/DownloadProvider.java
src/com/android/providers/downloads/Helpers.java
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 1 | ||||
| -rw-r--r-- | src/com/android/providers/downloads/Helpers.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 0ce6b22b..f0190fd1 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -81,6 +81,7 @@ public final class DownloadProvider extends ContentProvider { Downloads._DATA, Downloads.COLUMN_MIME_TYPE, Downloads.COLUMN_VISIBILITY, + Downloads.COLUMN_DESTINATION, Downloads.COLUMN_CONTROL, Downloads.COLUMN_STATUS, Downloads.COLUMN_LAST_MODIFICATION, diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java index 866cddcb..d8f262c7 100644 --- a/src/com/android/providers/downloads/Helpers.java +++ b/src/com/android/providers/downloads/Helpers.java @@ -426,9 +426,9 @@ public class Helpers { Downloads.CONTENT_URI, null, "( " + - Downloads.COLUMN_STATUS + " = " + Downloads.STATUS_SUCCESS + " AND " + + Downloads.COLUMN_STATUS + " = '" + Downloads.STATUS_SUCCESS + "' AND " + Downloads.COLUMN_DESTINATION + - " = " + Downloads.DESTINATION_CACHE_PARTITION_PURGEABLE + " )", + " = '" + Downloads.DESTINATION_CACHE_PARTITION_PURGEABLE + "' )", null, Downloads.COLUMN_LAST_MODIFICATION); if (cursor == null) { |