Merge branch 'master' of git://android.git.kernel.org/platform/packages/providers/DownloadProvider into eclaireclair

Conflicts:
	src/com/android/providers/downloads/DownloadThread.java

2 files changed, 5 insertions, 4 deletions

diff --git a/src/com/android/providers/downloads/DownloadNotification.java b/src/com/android/providers/downloads/DownloadNotification.java
index 9f54190e..f7c10073 100644
--- a/src/com/android/providers/downloads/DownloadNotification.java
+++ b/src/com/android/providers/downloads/DownloadNotification.java
@@ -276,6 +276,7 @@ class DownloadNotification {
             intent.setClassName("com.android.providers.downloads",
                     DownloadReceiver.class.getName());
             intent.setData(contentUri);
+            n.when = c.getLong(lastModColumnId);
             n.setLatestEventInfo(mContext, title, caption,
                     PendingIntent.getBroadcast(mContext, 0, intent, 0));
 
@@ -285,8 +286,6 @@ class DownloadNotification {
             intent.setData(contentUri);
             n.deleteIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0);
 
-            n.when = c.getLong(lastModColumnId);
-
             mNotificationMgr.notify(c.getInt(idColumn), n);
         }
         c.close();
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index d0a33bdf..1ad1d4f9 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -710,8 +710,10 @@ http_request_loop:
                         if(downloadedFileStream != null) {
                             try {
                                 downloadedFileStream.close();
-                            } catch (IOException e) {
-                                Log.w(Constants.TAG, "IOException while closing synced file: ", e);
+                            } catch (IOException ex) {
+                                Log.w(Constants.TAG, "IOException while closing synced file: ", ex);
+                            } catch (RuntimeException ex) {
+                                Log.w(Constants.TAG, "exception while closing file: ", ex);
                             }
                         }
                     }