diff options
author | Steve Kondik <shade@chemlab.org> | 2010-05-10 17:13:18 -0400 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2010-05-10 17:13:18 -0400 |
commit | 9a2c94b041f03d39cb88c1a8d4c43d7276e7f11e (patch) | |
tree | 03d52e7e5cbc95d5b2d48a83622f576bda9c275e | |
parent | 9d28a183ff6eaa91f283b00b449250c2f711c780 (diff) | |
parent | 72f14a6f122f020e560e6572b2581c43b3ea90e3 (diff) | |
download | android_packages_providers_DownloadProvider-eclair.tar.gz android_packages_providers_DownloadProvider-eclair.tar.bz2 android_packages_providers_DownloadProvider-eclair.zip |
Merge branch 'master' of git://android.git.kernel.org/platform/packages/providers/DownloadProvider into eclaireclair
Conflicts:
src/com/android/providers/downloads/DownloadThread.java
-rw-r--r-- | src/com/android/providers/downloads/DownloadNotification.java | 3 | ||||
-rw-r--r-- | src/com/android/providers/downloads/DownloadThread.java | 6 |
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); } } } |