commit 5048492e352be8134d92178d757a60117491e292
author Jeff Sharkey <jsharkey@android.com> Tue Mar 26 13:15:43 2013 -0700
committer Jeff Sharkey <jsharkey@android.com> Tue Mar 26 13:15:43 2013 -0700
tree 57ef7dc7aa3c290315a613170a3f7b166a8f50ba
parent ff0220f5b4624049a1052bd868d7706eee5a0daf

New PendingIntents when extras change.

Otherwise notifications end up launching with stale download IDs.

Bug: 8417220
Change-Id: Ie72a2f4ac7b72213678ac6001af45709034492dd

src/com/android/providers/downloads/DownloadNotifier.java

diff --git a/src/com/android/providers/downloads/DownloadNotifier.java b/src/com/android/providers/downloads/DownloadNotifier.java
index f832eae..df0bf84 100644
--- a/src/com/android/providers/downloads/DownloadNotifier.java
+++ b/src/com/android/providers/downloads/DownloadNotifier.java
@@ -165,7 +165,8 @@
                         null, mContext, DownloadReceiver.class);
                 intent.putExtra(DownloadManager.EXTRA_NOTIFICATION_CLICK_DOWNLOAD_IDS,
                         getDownloadIds(cluster));
-                builder.setContentIntent(PendingIntent.getBroadcast(mContext, 0, intent, 0));
+                builder.setContentIntent(PendingIntent.getBroadcast(
+                        mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT));
                 builder.setOngoing(true);
 
             } else if (type == TYPE_COMPLETE) {
@@ -187,7 +188,8 @@
                 final Intent intent = new Intent(action, uri, mContext, DownloadReceiver.class);
                 intent.putExtra(DownloadManager.EXTRA_NOTIFICATION_CLICK_DOWNLOAD_IDS,
                         getDownloadIds(cluster));
-                builder.setContentIntent(PendingIntent.getBroadcast(mContext, 0, intent, 0));
+                builder.setContentIntent(PendingIntent.getBroadcast(
+                        mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT));
 
                 final Intent hideIntent = new Intent(Constants.ACTION_HIDE,
                         uri, mContext, DownloadReceiver.class);