Merge "Make mutable implicit PendingIntent explicit for security reasons" am: 9b2df0e11f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2346082
Change-Id: Ia79751d20158f231e0b79fe8e4b4f3c93f98a7ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index f596b79..d4b23a3 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -1190,7 +1190,8 @@
final String extraBoolKey = "extra_bool";
firstIntent = PendingIntent.getBroadcast(mContext,
0 /* requestCode */,
- new Intent(broadcastAction).putExtra(extraBoolKey, false),
+ new Intent(broadcastAction).putExtra(extraBoolKey, false)
+ .setPackage(mContext.getPackageName()),
PendingIntent.FLAG_UPDATE_CURRENT | pendingIntentFlagMutable);
if (useListen) {
@@ -1203,7 +1204,8 @@
// intent will be updated with the new extras
secondIntent = PendingIntent.getBroadcast(mContext,
0 /* requestCode */,
- new Intent(broadcastAction).putExtra(extraBoolKey, true),
+ new Intent(broadcastAction).putExtra(extraBoolKey, true)
+ .setPackage(mContext.getPackageName()),
PendingIntent.FLAG_UPDATE_CURRENT | pendingIntentFlagMutable);
// Because secondIntent.intentFilterEquals the first, the request should be replaced