diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-10-23 11:24:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-23 11:24:41 +0000 |
| commit | 00a5b9b4d446db481be3b68d82834446a4eeecfa (patch) | |
| tree | d8df9a493327a2c8200a370ff4b167129ad9a598 /core | |
| parent | 896b3833298fcf2be3b66eb991bc2559dcb9d300 (diff) | |
| parent | a230de92fec3a6963f4f0af3fa4f32bdb8990fed (diff) | |
Merge "Add a mutability flag to the PendingIntent" am: 2a4ac569b0 am: 0cfb318d10 am: 49a146399c am: a230de92fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456120
Change-Id: I1e0adcc9affae154318f2e92a75ce190c97d3b10
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/com/android/internal/net/VpnConfig.java | 3 |
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) |