LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add a mutability flag to the PendingIntent"

Browse Source
This commit is contained in:
Treehugger Robot
2020-10-23 09:49:27 +00:00
committed by Gerrit Code Review
parent c3bc747513 6f94c0f756
commit de9d06b653
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/connectivity/LingerMonitor.java
View File

@@ -159,8 +159,9 @@ public class LingerMonitor {
@VisibleForTesting @VisibleForTesting
protected PendingIntent createNotificationIntent() { protected PendingIntent createNotificationIntent() {
return PendingIntent.getActivityAsUser(mContext, 0, CELLULAR_SETTINGS, return PendingIntent.getActivityAsUser(mContext, 0 /* requestCode */, CELLULAR_SETTINGS,
PendingIntent.FLAG_CANCEL_CURRENT, null, UserHandle.CURRENT); PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE,
null /* options */, UserHandle.CURRENT);
} }
// Removes any notification that was put up as a result of switching to nai. // Removes any notification that was put up as a result of switching to nai.

3
services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
View File

@@ -325,7 +325,8 @@ public class NetworkNotificationManager {
public void setProvNotificationVisible(boolean visible, int id, String action) { public void setProvNotificationVisible(boolean visible, int id, String action) {
if (visible) { if (visible) {
Intent intent = new Intent(action); Intent intent = new Intent(action);
PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0); PendingIntent pendingIntent = PendingIntent.getBroadcast(
mContext, 0 /* requestCode */, intent, PendingIntent.FLAG_IMMUTABLE);
showNotification(id, NotificationType.SIGN_IN, null, null, pendingIntent, false); showNotification(id, NotificationType.SIGN_IN, null, null, pendingIntent, false);
} else { } else {
clearNotification(id); clearNotification(id);