From 33f175857101a6aa5d355eb4f0d351c4b6e454a4 Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Mon, 6 Jul 2020 14:32:19 -0700 Subject: [PATCH] Make Print notification intent immutable They are not meant fro modification. Test: Clicked on a notification to follow the intent Fixes: 156009434 Change-Id: I04abfb4def70f05b30a2a35c8889c5a1a6857de0 --- .../printspooler/model/NotificationController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java b/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java index abdfad5bb27ad..88b181fc5e0c2 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java +++ b/packages/PrintSpooler/src/com/android/printspooler/model/NotificationController.java @@ -276,21 +276,23 @@ final class NotificationController { intent.putExtra(EXTRA_PRINT_JOB_ID, printJobId.flattenToString()); intent.setData(Uri.fromParts("printjob", printJobId.flattenToString(), null)); } - return PendingIntent.getActivity(mContext, 0, intent, 0); + return PendingIntent.getActivity(mContext, 0, intent, PendingIntent.FLAG_IMMUTABLE); } private PendingIntent createCancelIntent(PrintJobInfo printJob) { Intent intent = new Intent(mContext, NotificationBroadcastReceiver.class); intent.setAction(INTENT_ACTION_CANCEL_PRINTJOB + "_" + printJob.getId().flattenToString()); intent.putExtra(EXTRA_PRINT_JOB_ID, printJob.getId()); - return PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_ONE_SHOT); + return PendingIntent.getBroadcast(mContext, 0, intent, + PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE); } private PendingIntent createRestartIntent(PrintJobId printJobId) { Intent intent = new Intent(mContext, NotificationBroadcastReceiver.class); intent.setAction(INTENT_ACTION_RESTART_PRINTJOB + "_" + printJobId.flattenToString()); intent.putExtra(EXTRA_PRINT_JOB_ID, printJobId); - return PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_ONE_SHOT); + return PendingIntent.getBroadcast(mContext, 0, intent, + PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE); } private static boolean shouldNotifyForState(int state) {