Merge "(GB/GBMR) (do not merge) delete file from disk when deleting from db" into gingerbread

1 files changed, 9 insertions, 0 deletions

diff --git a/ui/src/com/android/providers/downloads/ui/DownloadList.java b/ui/src/com/android/providers/downloads/ui/DownloadList.java
index 0ab3f936..dfd5ffc9 100644
--- a/ui/src/com/android/providers/downloads/ui/DownloadList.java
+++ b/ui/src/com/android/providers/downloads/ui/DownloadList.java
@@ -52,6 +52,7 @@ import android.widget.Toast;
 
 import com.android.providers.downloads.ui.DownloadItem.DownloadSelectListener;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.HashSet;
@@ -592,6 +593,14 @@ public class DownloadList extends Activity
                         return;
                     } else {
                         getContentResolver().delete(Uri.parse(mediaProviderUri), null, null);
+                        // sometimes mediaprovider doesn't delete file from sdcard after deleting it
+                        // from its db. delete it now
+                        try {
+                          File file = new File(path);
+                          file.delete();
+                      } catch (Exception e) {
+                          Log.w(LOG_TAG, "file: '" + path + "' couldn't be deleted", e);
+                      }
                     }
                 }
             }