diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-04-05 13:01:11 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2013-04-05 13:01:11 -0700 |
commit | 82d26295ca202bdcbb56343117fd450a2b7097c0 (patch) | |
tree | 0e0a42302577cab01855edb7c14530c7ec5ffa78 | |
parent | 5048492e352be8134d92178d757a60117491e292 (diff) | |
parent | ab2d11faa4bfe73f21ecd13507cfb694b84a4964 (diff) | |
download | android_packages_providers_DownloadProvider-82d26295ca202bdcbb56343117fd450a2b7097c0.tar.gz android_packages_providers_DownloadProvider-82d26295ca202bdcbb56343117fd450a2b7097c0.tar.bz2 android_packages_providers_DownloadProvider-82d26295ca202bdcbb56343117fd450a2b7097c0.zip |
Merge commit 'ab2d11fa' into merge2
Change-Id: I92cd6985b8074a238118b95599e4df57e6849f62
-rw-r--r-- | src/com/android/providers/downloads/DownloadNotifier.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/providers/downloads/DownloadNotifier.java b/src/com/android/providers/downloads/DownloadNotifier.java index df0bf840..04054783 100644 --- a/src/com/android/providers/downloads/DownloadNotifier.java +++ b/src/com/android/providers/downloads/DownloadNotifier.java @@ -161,12 +161,14 @@ public class DownloadNotifier { // Build action intents if (type == TYPE_ACTIVE || type == TYPE_WAITING) { + // build a synthetic uri for intent identification purposes + final Uri uri = new Uri.Builder().scheme("active-dl").appendPath(tag).build(); final Intent intent = new Intent(Constants.ACTION_LIST, - null, mContext, DownloadReceiver.class); + uri, mContext, DownloadReceiver.class); intent.putExtra(DownloadManager.EXTRA_NOTIFICATION_CLICK_DOWNLOAD_IDS, getDownloadIds(cluster)); - builder.setContentIntent(PendingIntent.getBroadcast( - mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT)); + builder.setContentIntent(PendingIntent.getBroadcast(mContext, + 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)); builder.setOngoing(true); } else if (type == TYPE_COMPLETE) { @@ -188,8 +190,8 @@ public class DownloadNotifier { 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, PendingIntent.FLAG_CANCEL_CURRENT)); + builder.setContentIntent(PendingIntent.getBroadcast(mContext, + 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)); final Intent hideIntent = new Intent(Constants.ACTION_HIDE, uri, mContext, DownloadReceiver.class); |