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

Merge "Bulk apply PendingIntent.FLAG_MUTABLE_UNAUDITED."

Browse Source
This commit is contained in:
Ashwini Oruganti
2021-01-11 18:25:05 +00:00
committed by Android (Google) Code Review
parent 1447ed1fa5 2f349da025
commit eb9e2e74cc
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/homepage/contextualcards/slices/FaceSetupSlice.java
View File

@@ -143,7 +143,7 @@ public class FaceSetupSlice implements CustomSliceable {
private static RowBuilder buildRowBuilder(CharSequence title, CharSequence subTitle, private static RowBuilder buildRowBuilder(CharSequence title, CharSequence subTitle,
IconCompat icon, Context context, Intent intent) { IconCompat icon, Context context, Intent intent) {
final SliceAction primarySliceAction = SliceAction.createDeeplink( final SliceAction primarySliceAction = SliceAction.createDeeplink(
PendingIntent.getActivity(context, 0, intent, 0), icon, ListBuilder.ICON_IMAGE, PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED), icon, ListBuilder.ICON_IMAGE,
title); title);
return new RowBuilder() return new RowBuilder()
.setTitleItem(icon, ListBuilder.ICON_IMAGE) .setTitleItem(icon, ListBuilder.ICON_IMAGE)

2
src/com/android/settings/network/telephony/EuiccOperationSidecar.java
View File

@@ -99,7 +99,7 @@ public abstract class EuiccOperationSidecar extends SidecarFragment {
Intent intent = new Intent(getReceiverAction()); Intent intent = new Intent(getReceiverAction());
intent.putExtra(EXTRA_OP_ID, mOpId); intent.putExtra(EXTRA_OP_ID, mOpId);
return PendingIntent.getBroadcast( return PendingIntent.getBroadcast(
getContext(), REQUEST_CODE, intent, PendingIntent.FLAG_CANCEL_CURRENT); getContext(), REQUEST_CODE, intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED);
} }
@Override @Override

2
src/com/android/settings/network/telephony/MobileDataSlice.java
View File

@@ -173,7 +173,7 @@ public class MobileDataSlice implements CustomSliceable {
private PendingIntent getPrimaryAction() { private PendingIntent getPrimaryAction() {
final Intent intent = getIntent(); final Intent intent = getIntent();
return PendingIntent.getActivity(mContext, 0 /* requestCode */, return PendingIntent.getActivity(mContext, 0 /* requestCode */,
intent, 0 /* flags */); intent, PendingIntent.FLAG_MUTABLE_UNAUDITED /* flags */);
} }
/** /**

6
src/com/android/settings/sim/SimSelectNotification.java
View File

@@ -226,7 +226,7 @@ public class SimSelectNotification extends BroadcastReceiver {
resultIntent.setPackage(SETTINGS_PACKAGE_NAME); resultIntent.setPackage(SETTINGS_PACKAGE_NAME);
resultIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); resultIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent, PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent,
PendingIntent.FLAG_CANCEL_CURRENT); PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED);
builder.setContentIntent(resultPendingIntent); builder.setContentIntent(resultPendingIntent);
NotificationManager notificationManager = NotificationManager notificationManager =
(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
@@ -264,7 +264,7 @@ public class SimSelectNotification extends BroadcastReceiver {
resultIntent.putExtra(Settings.EXTRA_SUB_ID, subId); resultIntent.putExtra(Settings.EXTRA_SUB_ID, subId);
resultIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); resultIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent, PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent,
PendingIntent.FLAG_CANCEL_CURRENT); PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED);
builder.setContentIntent(resultPendingIntent); builder.setContentIntent(resultPendingIntent);
// Notify the notification. // Notify the notification.
@@ -312,7 +312,7 @@ public class SimSelectNotification extends BroadcastReceiver {
resultIntent.putExtra(Intent.EXTRA_TEXT, "help_uri_sim_combination_warning"); resultIntent.putExtra(Intent.EXTRA_TEXT, "help_uri_sim_combination_warning");
PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent, PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent,
PendingIntent.FLAG_CANCEL_CURRENT); PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED);
builder.setContentIntent(resultPendingIntent); builder.setContentIntent(resultPendingIntent);
NotificationManager notificationManager = NotificationManager notificationManager =

6
src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
View File

@@ -539,7 +539,7 @@ public class WifiCallingSliceHelper {
*/ */
public static PendingIntent getSettingsIntent(Context context) { public static PendingIntent getSettingsIntent(Context context) {
final Intent intent = new Intent(Settings.ACTION_SETTINGS); final Intent intent = new Intent(Settings.ACTION_SETTINGS);
return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */); return PendingIntent.getActivity(context, 0 /* requestCode */, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED /* flags */);
} }
private PendingIntent getBroadcastIntent(String action) { private PendingIntent getBroadcastIntent(String action) {
@@ -547,7 +547,7 @@ public class WifiCallingSliceHelper {
intent.setClass(mContext, SliceBroadcastReceiver.class); intent.setClass(mContext, SliceBroadcastReceiver.class);
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent, return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent,
PendingIntent.FLAG_CANCEL_CURRENT); PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED);
} }
/** /**
@@ -557,7 +557,7 @@ public class WifiCallingSliceHelper {
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_MUTABLE_UNAUDITED /* flags */);
} }
private Resources getResourcesForSubId(int subId) { private Resources getResourcesForSubId(int subId) {

4
tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
View File

@@ -397,14 +397,14 @@ public class WifiCallingSliceHelperTest {
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_MUTABLE_UNAUDITED);
} }
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_MUTABLE_UNAUDITED /* flags */);
} }
private void assertTitle(List<SliceItem> sliceItems, String title) { private void assertTitle(List<SliceItem> sliceItems, String title) {