summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMahendaviAamir <mahendavi.aamirmohammedbhai@sasken.com>2021-06-09 17:10:42 +0530
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-08-12 08:05:03 +0000
commitd03d598da4ce4ee12b4269b360fbe581019a1916 (patch)
tree433c9a07943744fe7cc2d627eb8ff11219b31425
parentc2852d0c1855175155c8ac1aba47baca8f8cab0d (diff)
downloadbase-d03d598da4ce4ee12b4269b360fbe581019a1916.tar.gz
Send targeted broadcasts to prevent other apps from receiving them.
When sending broadcasts ACTION_SNOOZE_WARNING in NPMS, which may contain sensitive information, explicitly set the package name that should receive it to prevent other apps from receiving them. Bug: 177931370 Test: manual Change-Id: I2a0a0dc09e27791de829bacfb2e865ffea993715 Merged-In: I11d736771d859d2af27d5c84a502ab038974e2e2 (cherry picked from commit fdbcf17a4eda04e3140b5d97658a3d4815abd9f5)
-rw-r--r--services/core/java/com/android/server/net/NetworkPolicyManagerService.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 5159c70e991c..0940c09049bd 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -1155,8 +1155,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
builder.setContentText(body);
builder.setDefaults(Notification.DEFAULT_ALL);
builder.setChannelId(SystemNotificationChannels.NETWORK_ALERTS);
-
- final Intent snoozeIntent = buildSnoozeWarningIntent(policy.template);
+ final Intent snoozeIntent = buildSnoozeWarningIntent(policy.template,
+ mContext.getPackageName());
builder.setDeleteIntent(PendingIntent.getBroadcast(
mContext, 0, snoozeIntent, PendingIntent.FLAG_UPDATE_CURRENT));
@@ -4243,9 +4243,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
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);
intent.putExtra(EXTRA_NETWORK_TEMPLATE, template);
+ intent.setPackage(targetPackage);
return intent;
}