diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java index 64bb201e97b..81db4df3290 100644 --- a/src/com/android/settings/accounts/AddAccountSettings.java +++ b/src/com/android/settings/accounts/AddAccountSettings.java @@ -247,7 +247,8 @@ public class AddAccountSettings extends Activity { identityIntent.setAction(SHOULD_NOT_RESOLVE); identityIntent.addCategory(SHOULD_NOT_RESOLVE); - mPendingIntent = PendingIntent.getBroadcast(this, 0, identityIntent, 0); + mPendingIntent = PendingIntent.getBroadcast(this, 0, identityIntent, + PendingIntent.FLAG_IMMUTABLE); addAccountOptions.putParcelable(KEY_CALLER_IDENTITY, mPendingIntent); addAccountOptions.putBoolean(EXTRA_HAS_MULTIPLE_USERS, Utils.hasMultipleUsers(this)); AccountManager.get(this).addAccountAsUser( diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java index 5a4ee1fe029..67c365007f3 100644 --- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java +++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java @@ -129,13 +129,13 @@ public class BluetoothSliceBuilder { private static PendingIntent getPrimaryAction(Context context) { final Intent intent = getIntent(context); return PendingIntent.getActivity(context, 0 /* requestCode */, - intent, 0 /* flags */); + intent, PendingIntent.FLAG_IMMUTABLE); } private static PendingIntent getBroadcastIntent(Context context) { final Intent intent = new Intent(ACTION_BLUETOOTH_SLICE_CHANGED) .setClass(context, SliceBroadcastReceiver.class); return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent, - PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); } } diff --git a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java index d99d01ed780..6a5b3000bc8 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java @@ -163,7 +163,8 @@ public class BatteryFixSlice implements CustomSliceable { private PendingIntent getPrimaryAction() { final Intent intent = getIntent(); - return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */); + return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, + PendingIntent.FLAG_IMMUTABLE); } private Slice buildBatteryGoodSlice(ListBuilder sliceBuilder, boolean isError) { diff --git a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java index 2bc09e9f72d..576b4355ea0 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java @@ -116,8 +116,8 @@ public class LowStorageSlice implements CustomSliceable { private RowBuilder buildRowBuilder(CharSequence title, String summary, IconCompat icon) { final SliceAction primarySliceAction = SliceAction.createDeeplink( - PendingIntent.getActivity(mContext, 0, getIntent(), 0), icon, - ListBuilder.ICON_IMAGE, title); + PendingIntent.getActivity(mContext, 0, getIntent(), PendingIntent.FLAG_IMMUTABLE), + icon, ListBuilder.ICON_IMAGE, title); return new RowBuilder() .setTitleItem(icon, ListBuilder.ICON_IMAGE) diff --git a/src/com/android/settings/location/LocationSlice.java b/src/com/android/settings/location/LocationSlice.java index 275969046ad..f8add128e1e 100644 --- a/src/com/android/settings/location/LocationSlice.java +++ b/src/com/android/settings/location/LocationSlice.java @@ -96,6 +96,6 @@ public class LocationSlice implements CustomSliceable { private PendingIntent getPrimaryAction() { final Intent intent = getIntent(); return PendingIntent.getActivity(mContext, 0 /* requestCode */, - intent, 0 /* flags */); + intent, PendingIntent.FLAG_IMMUTABLE); } } diff --git a/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java b/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java index c9a203e2f4c..14c91177de7 100644 --- a/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java +++ b/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java @@ -142,13 +142,14 @@ public class ZenModeSliceBuilder { private static PendingIntent getPrimaryAction(Context context) { final Intent intent = getIntent(context); - return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */); + return PendingIntent.getActivity(context, 0 /* requestCode */, intent, + PendingIntent.FLAG_IMMUTABLE); } private static PendingIntent getBroadcastIntent(Context context) { final Intent intent = new Intent(ACTION_ZEN_MODE_SLICE_CHANGED) .setClass(context, SliceBroadcastReceiver.class); return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent, - PendingIntent.FLAG_CANCEL_CURRENT); + PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE); } } diff --git a/src/com/android/settings/slices/CustomSliceable.java b/src/com/android/settings/slices/CustomSliceable.java index 92c604e189a..57475a9aa90 100644 --- a/src/com/android/settings/slices/CustomSliceable.java +++ b/src/com/android/settings/slices/CustomSliceable.java @@ -95,7 +95,7 @@ public interface CustomSliceable extends Sliceable { .setData(getUri()) .setClass(context, SliceBroadcastReceiver.class); return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent, - PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); } @Override diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java index 552927e1da2..402e044230d 100644 --- a/src/com/android/settings/slices/SliceBuilderUtils.java +++ b/src/com/android/settings/slices/SliceBuilderUtils.java @@ -159,7 +159,7 @@ public class SliceBuilderUtils { .setClass(context, SliceBroadcastReceiver.class) .putExtra(EXTRA_SLICE_KEY, data.getKey()); return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent, - PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE); } /** @@ -167,7 +167,8 @@ public class SliceBuilderUtils { */ public static PendingIntent getContentPendingIntent(Context context, SliceData sliceData) { final Intent intent = getContentIntent(context, sliceData); - return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */); + return PendingIntent.getActivity(context, 0 /* requestCode */, intent, + PendingIntent.FLAG_IMMUTABLE); } /**