Snap for 7992035 from d8e16e139a319b6cb91d245a9b728f6e9b88d719 to sc-v2-release
Change-Id: I49839862adcae96373ac6f4958f0a3bd334658ff
diff --git a/PermissionController/src/com/android/permissioncontroller/incident/PendingList.java b/PermissionController/src/com/android/permissioncontroller/incident/PendingList.java
index f4a7752..d732732 100644
--- a/PermissionController/src/com/android/permissioncontroller/incident/PendingList.java
+++ b/PermissionController/src/com/android/permissioncontroller/incident/PendingList.java
@@ -244,13 +244,13 @@
// Intent for the confirmation dialog.
final PendingIntent dialog = PendingIntent.getActivity(mContext, 0,
- newDialogIntent(rec), 0);
+ newDialogIntent(rec), PendingIntent.FLAG_IMMUTABLE);
// Intent for the approval and denial.
final PendingIntent deny = PendingIntent.getBroadcast(mContext, 0,
new Intent(ApprovalReceiver.ACTION_DENY, rec.report.getUri(),
mContext, ApprovalReceiver.class),
- 0);
+ PendingIntent.FLAG_IMMUTABLE);
// Construct the notification
final Notification notification = new Notification.Builder(mContext)
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/LocationAccessCheck.java b/PermissionController/src/com/android/permissioncontroller/permission/service/LocationAccessCheck.java
index 76e3f33..6ce0083 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/service/LocationAccessCheck.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/service/LocationAccessCheck.java
@@ -20,6 +20,7 @@
import static android.Manifest.permission_group.LOCATION;
import static android.app.AppOpsManager.OPSTR_FINE_LOCATION;
import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.PendingIntent.FLAG_IMMUTABLE;
import static android.app.PendingIntent.FLAG_ONE_SHOT;
import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
import static android.app.PendingIntent.getBroadcast;
@@ -605,7 +606,7 @@
.setDeleteIntent(getBroadcast(mContext, 0, deleteIntent,
FLAG_ONE_SHOT | FLAG_UPDATE_CURRENT))
.setContentIntent(getBroadcast(mContext, 0, clickIntent,
- FLAG_ONE_SHOT | FLAG_UPDATE_CURRENT));
+ FLAG_ONE_SHOT | FLAG_UPDATE_CURRENT | FLAG_IMMUTABLE));
if (appName != null) {
Bundle extras = new Bundle();
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/AutoGrantPermissionsNotifier.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/AutoGrantPermissionsNotifier.java
index a006e4b..8775d39 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/AutoGrantPermissionsNotifier.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/AutoGrantPermissionsNotifier.java
@@ -16,6 +16,7 @@
package com.android.permissioncontroller.permission.ui;
+import static android.app.PendingIntent.FLAG_IMMUTABLE;
import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
import static android.app.PendingIntent.getActivity;
import static android.content.Intent.ACTION_MANAGE_APP_PERMISSION;
@@ -166,7 +167,7 @@
.setLargeIcon(pkgIconBmp)
.setColor(mContext.getColor(android.R.color.system_notification_accent_color))
.setContentIntent(getActivity(mContext, packageBasedRequestCode,
- manageAppPermission, FLAG_UPDATE_CURRENT));
+ manageAppPermission, FLAG_UPDATE_CURRENT | FLAG_IMMUTABLE));
// Add the Settings app name since we masquerade it.
CharSequence appName = getSettingsAppName();