Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a mutability flag to the PendingIntent" am: 2a4ac569b0 am: 0cfb318d10 am: 49a146399c am: a230de92fe

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456120

Change-Id: I1e0adcc9affae154318f2e92a75ce190c97d3b10
This commit is contained in:
Treehugger Robot
2020-10-23 11:24:41 +00:00
committed by Automerger Merge Worker
parent 896b383329 a230de92fe
commit 00a5b9b4d4
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/net/VpnConfig.java
View File

@@ -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)