summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-10-23 09:49:27 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-10-23 09:49:27 +0000
commit2a4ac569b09832e45cae80733cc714f214cf79fa (patch)
treea78cdd0a75d48e50cbf0c40f9432bd4b38281ed7 /core/java
parentd769b3863e1937cca5ef7c2a2f05e7563350eb92 (diff)
parent529cda4f3110a17b4babdd054b913bb0e5824f94 (diff)
Merge "Add a mutability flag to the PendingIntent"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/net/VpnConfig.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/com/android/internal/net/VpnConfig.java b/core/java/com/android/internal/net/VpnConfig.java
index 7dc38711a6ef..c0648ab89c41 100644
--- a/core/java/com/android/internal/net/VpnConfig.java
+++ b/core/java/com/android/internal/net/VpnConfig.java
@@ -70,7 +70,8 @@ public class VpnConfig implements Parcelable {
intent.setClassName(DIALOGS_PACKAGE, DIALOGS_PACKAGE + ".ManageDialog");
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_HISTORY |
Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
- return PendingIntent.getActivityAsUser(context, 0, intent, 0, null, UserHandle.CURRENT);
+ return PendingIntent.getActivityAsUser(context, 0 /* requestCode */, intent,
+ PendingIntent.FLAG_IMMUTABLE, null /* options */, UserHandle.CURRENT);
}
public static CharSequence getVpnLabel(Context context, String packageName)