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

Merge "Send targeted broadcasts to prevent other apps from receiving them." into oc-mr1-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2021-08-11 02:44:06 +00:00
committed by Android (Google) Code Review
parent 58dcd2c312 fdbcf17a4e
commit b10d3c4609
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -1155,8 +1155,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
builder.setContentText(body); builder.setContentText(body);
builder.setDefaults(Notification.DEFAULT_ALL); builder.setDefaults(Notification.DEFAULT_ALL);
builder.setChannelId(SystemNotificationChannels.NETWORK_ALERTS); builder.setChannelId(SystemNotificationChannels.NETWORK_ALERTS);
final Intent snoozeIntent = buildSnoozeWarningIntent(policy.template,
final Intent snoozeIntent = buildSnoozeWarningIntent(policy.template); mContext.getPackageName());
builder.setDeleteIntent(PendingIntent.getBroadcast( builder.setDeleteIntent(PendingIntent.getBroadcast(
mContext, 0, snoozeIntent, PendingIntent.FLAG_UPDATE_CURRENT)); mContext, 0, snoozeIntent, PendingIntent.FLAG_UPDATE_CURRENT));
@@ -4243,9 +4243,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
return new Intent(ACTION_ALLOW_BACKGROUND); return new Intent(ACTION_ALLOW_BACKGROUND);
} }
private static Intent buildSnoozeWarningIntent(NetworkTemplate template) { private static Intent buildSnoozeWarningIntent(NetworkTemplate template, String targetPackage) {
final Intent intent = new Intent(ACTION_SNOOZE_WARNING); final Intent intent = new Intent(ACTION_SNOOZE_WARNING);
intent.putExtra(EXTRA_NETWORK_TEMPLATE, template); intent.putExtra(EXTRA_NETWORK_TEMPLATE, template);
intent.setPackage(targetPackage);
return intent; return intent;
} }