diff options
author | Steve Howard <showard@google.com> | 2010-09-16 13:58:30 -0700 |
---|---|---|
committer | Steve Howard <showard@google.com> | 2010-09-16 13:58:30 -0700 |
commit | 176a74426f750dc56e7d200a4cdc3b6ed75fe6cd (patch) | |
tree | 5e83e23318b22ce2877186a5b0aa9ab93978d4b7 /src/com/android/providers/downloads/Helpers.java | |
parent | 57df1b6a7219e049371cae72b36a63d04e214f59 (diff) | |
parent | 3d55d829c03fe78ad8cdab119293efb6c6e49c64 (diff) | |
download | android_packages_providers_DownloadProvider-176a74426f750dc56e7d200a4cdc3b6ed75fe6cd.tar.gz android_packages_providers_DownloadProvider-176a74426f750dc56e7d200a4cdc3b6ed75fe6cd.tar.bz2 android_packages_providers_DownloadProvider-176a74426f750dc56e7d200a4cdc3b6ed75fe6cd.zip |
resolved conflicts for merge of 3d55d829 to gingerbread-plus-aosp
Change-Id: I18ede2f2d5ad8aa40cd61bdb7213659d356fdf57
Diffstat (limited to 'src/com/android/providers/downloads/Helpers.java')
-rw-r--r-- | src/com/android/providers/downloads/Helpers.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java index e2dc9e86..a74810fe 100644 --- a/src/com/android/providers/downloads/Helpers.java +++ b/src/com/android/providers/downloads/Helpers.java @@ -470,7 +470,7 @@ public class Helpers { */ public static final boolean discardPurgeableFiles(Context context, long targetBytes) { Cursor cursor = context.getContentResolver().query( - Downloads.Impl.CONTENT_URI, + Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, null, "( " + Downloads.Impl.COLUMN_STATUS + " = '" + Downloads.Impl.STATUS_SUCCESS + "' AND " + @@ -494,7 +494,8 @@ public class Helpers { file.delete(); long id = cursor.getLong(cursor.getColumnIndex(Downloads.Impl._ID)); context.getContentResolver().delete( - ContentUris.withAppendedId(Downloads.Impl.CONTENT_URI, id), null, null); + ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id), + null, null); cursor.moveToNext(); } } finally { |