From 50dd14d1115c5ee54c7b7ecfeddfa6f8e3ed56d5 Mon Sep 17 00:00:00 2001 From: Jeremy Goldman Date: Mon, 14 Dec 2020 15:40:35 +0800 Subject: [PATCH] Enhanced4gLteSliceHelper specifies immutable intent Bug: 172812686 Fixes: 172207848 Test: atest -c Enhanced4gLteSliceHelperTest Change-Id: I1bfac82e3ce5c66639465befb0517839fb55415e --- .../settings/network/telephony/Enhanced4gLteSliceHelper.java | 5 +++-- .../network/telephony/Enhanced4gLteSliceHelperTest.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java index d2eab3e716a..158beccceee 100644 --- a/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java +++ b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java @@ -270,7 +270,7 @@ public class Enhanced4gLteSliceHelper { final Intent intent = new Intent(action); intent.setClass(mContext, SliceBroadcastReceiver.class); return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent, - PendingIntent.FLAG_CANCEL_CURRENT); + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE); } /** @@ -287,7 +287,8 @@ public class Enhanced4gLteSliceHelper { final Intent intent = new Intent(action); intent.setPackage(SETTINGS_PACKAGE_NAME); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */); + return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, + PendingIntent.FLAG_IMMUTABLE); } @VisibleForTesting diff --git a/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java b/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java index 2b812c7c26b..2c6a8c6caf3 100644 --- a/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java @@ -237,14 +237,15 @@ public class Enhanced4gLteSliceHelperTest { final Intent intent = new Intent(action); intent.setClass(mContext, SliceBroadcastReceiver.class); return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent, - PendingIntent.FLAG_NO_CREATE); + PendingIntent.FLAG_NO_CREATE | PendingIntent.FLAG_IMMUTABLE); } private PendingIntent getActivityIntent(String action) { final Intent intent = new Intent(action); intent.setPackage(SETTINGS_PACKAGE_NAME); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */); + return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, + PendingIntent.FLAG_IMMUTABLE); } private void assertTitle(List sliceItems, String title) {