PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enhanced4gLteSliceHelper specifies immutable intent"

Browse Source
This commit is contained in:
Jeremy Goldman
2020-12-21 07:25:30 +00:00
committed by Android (Google) Code Review
parent fd6645be76 50dd14d111
commit 7d5483f6d7
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
View File

@@ -270,7 +270,7 @@ public class Enhanced4gLteSliceHelper {
final Intent intent = new Intent(action); final Intent intent = new Intent(action);
intent.setClass(mContext, SliceBroadcastReceiver.class); intent.setClass(mContext, SliceBroadcastReceiver.class);
return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent, 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); final Intent intent = new Intent(action);
intent.setPackage(SETTINGS_PACKAGE_NAME); intent.setPackage(SETTINGS_PACKAGE_NAME);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); 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 @VisibleForTesting

5
tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
View File

@@ -237,14 +237,15 @@ public class Enhanced4gLteSliceHelperTest {
final Intent intent = new Intent(action); final Intent intent = new Intent(action);
intent.setClass(mContext, SliceBroadcastReceiver.class); intent.setClass(mContext, SliceBroadcastReceiver.class);
return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent, return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent,
PendingIntent.FLAG_NO_CREATE); PendingIntent.FLAG_NO_CREATE | PendingIntent.FLAG_IMMUTABLE);
} }
private PendingIntent getActivityIntent(String action) { private PendingIntent getActivityIntent(String action) {
final Intent intent = new Intent(action); final Intent intent = new Intent(action);
intent.setPackage(SETTINGS_PACKAGE_NAME); intent.setPackage(SETTINGS_PACKAGE_NAME);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); 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<SliceItem> sliceItems, String title) { private void assertTitle(List<SliceItem> sliceItems, String title) {