summaryrefslogtreecommitdiffstats
path: root/src/com/android/providers/downloads/Helpers.java
diff options
context:
space:
mode:
authorVasu Nori <vnori@google.com>2010-10-15 16:07:22 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-15 16:07:22 -0700
commit216736d2d3636ed2dbd15053ccaafc8e75e42781 (patch)
tree71f843de1679abb9a9897c0c66e94e314fc7f244 /src/com/android/providers/downloads/Helpers.java
parent887a95e29a8776a07b411c472a11e82ad84464a8 (diff)
parentbe2eaa55bb3dca3422da25fe907b50a4ad70df17 (diff)
downloadandroid_packages_providers_DownloadProvider-216736d2d3636ed2dbd15053ccaafc8e75e42781.tar.gz
android_packages_providers_DownloadProvider-216736d2d3636ed2dbd15053ccaafc8e75e42781.tar.bz2
android_packages_providers_DownloadProvider-216736d2d3636ed2dbd15053ccaafc8e75e42781.zip
Merge "bug:3099994 NPE in DownloadManager when deleting non-media file" into gingerbread
Diffstat (limited to 'src/com/android/providers/downloads/Helpers.java')
-rw-r--r--src/com/android/providers/downloads/Helpers.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java
index cbcae5f4..855cba28 100644
--- a/src/com/android/providers/downloads/Helpers.java
+++ b/src/com/android/providers/downloads/Helpers.java
@@ -16,6 +16,7 @@
package com.android.providers.downloads;
+import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.Context;
import android.content.Intent;
@@ -799,4 +800,19 @@ public class Helpers {
(c >= '0' && c <= '9');
}
}
+
+ /**
+ * Delete the given file from device
+ * and delete its row from the downloads database.
+ */
+ /* package */ static void deleteFile(ContentResolver resolver, long id, String path, String mimeType) {
+ try {
+ File file = new File(path);
+ file.delete();
+ } catch (Exception e) {
+ Log.w(Constants.TAG, "file: '" + path + "' couldn't be deleted", e);
+ }
+ resolver.delete(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, Downloads.Impl._ID + " = ? ",
+ new String[]{String.valueOf(id)});
+ }
}