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 rvc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2021-08-11 02:26:50 +00:00
committed by Android (Google) Code Review
parent 0fe296d677 e329730572
commit 9c8226caab
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1362,7 +1362,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
builder.setSmallIcon(R.drawable.stat_notify_error); builder.setSmallIcon(R.drawable.stat_notify_error);
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));
@@ -1448,7 +1449,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
builder.setSmallIcon(R.drawable.stat_notify_error); builder.setSmallIcon(R.drawable.stat_notify_error);
final Intent snoozeIntent = buildSnoozeRapidIntent(policy.template); final Intent snoozeIntent = buildSnoozeRapidIntent(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));
@@ -5043,17 +5045,19 @@ 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.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(EXTRA_NETWORK_TEMPLATE, template); intent.putExtra(EXTRA_NETWORK_TEMPLATE, template);
intent.setPackage(targetPackage);
return intent; return intent;
} }
private static Intent buildSnoozeRapidIntent(NetworkTemplate template) { private static Intent buildSnoozeRapidIntent(NetworkTemplate template, String targetPackage) {
final Intent intent = new Intent(ACTION_SNOOZE_RAPID); final Intent intent = new Intent(ACTION_SNOOZE_RAPID);
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(EXTRA_NETWORK_TEMPLATE, template); intent.putExtra(EXTRA_NETWORK_TEMPLATE, template);
intent.setPackage(targetPackage);
return intent; return intent;
} }