Merge "Send targeted broadcasts to prevent other apps from receiving them." into sc-dev (0a35d1d6) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -1511,7 +1511,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

		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(
		mContext, 0, snoozeIntent, FLAG_UPDATE_CURRENT \| FLAG_IMMUTABLE));

		@@ -1597,7 +1598,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

		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(
		mContext, 0, snoozeIntent, FLAG_UPDATE_CURRENT \| FLAG_IMMUTABLE));

		@@ -5478,17 +5480,19 @@ 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.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
		intent.putExtra(EXTRA_NETWORK_TEMPLATE, template);
		intent.setPackage(targetPackage);
		return intent;
		}

		private static Intent buildSnoozeRapidIntent(NetworkTemplate template) {
		private static Intent buildSnoozeRapidIntent(NetworkTemplate template, String targetPackage) {
		final Intent intent = new Intent(ACTION_SNOOZE_RAPID);
		intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
		intent.putExtra(EXTRA_NETWORK_TEMPLATE, template);
		intent.setPackage(targetPackage);
		return intent;
		}