提交: fbd36bc62ba3c8dc5d3810672e731ecec161dd51 - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• 修訂: fbd36bc62ba3c8dc5d3810672e731ecec161dd51 (tree)
• 時間: 2020-12-18 16:38:18
• 作者: Tim Peng <timhypeng@goog...>
• Commiter: tim peng

Log Message

Add the explicitly mutable flag for creating a PendingIntent

Bug: 174047735
Test: make -j50 RunSettingsRoboTests
Merged-In: Ic37b37bdbe6de6bdbad741985d3a920334240d80
Change-Id: Id4a3c67025a06b63628298f4af28fbf5db45a566

Change Summary

• modified: src/com/android/settings/media/RemoteMediaSlice.java

差異

--- a/src/com/android/settings/media/RemoteMediaSlice.java
+++ b/src/com/android/settings/media/RemoteMediaSlice.java
@@ -177,7 +177,8 @@ public class RemoteMediaSlice implements CustomSliceable {
                 mContext.getText(R.string.sound_settings).toString(), 0);
         intent.setClassName(mContext.getPackageName(), SubSettings.class.getName());
         intent.setData(contentUri);
-        final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, 0);
+        final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent,
+                PendingIntent.FLAG_IMMUTABLE);
         final SliceAction primarySliceAction = SliceAction.createDeeplink(pendingIntent, icon,
                 ListBuilder.ICON_IMAGE, actionTitle);
         return primarySliceAction;
@@ -192,7 +193,8 @@ public class RemoteMediaSlice implements CustomSliceable {
                 .putExtra(SESSION_INFO, info)
                 .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         final PendingIntent primaryBroadcastIntent = PendingIntent.getBroadcast(mContext,
-                info.hashCode(), intent, PendingIntent.FLAG_UPDATE_CURRENT);
+                info.hashCode(), intent,
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         final SliceAction primarySliceAction = SliceAction.createDeeplink(
                 primaryBroadcastIntent,
                 IconCompat.createWithResource(mContext, R.drawable.ic_volume_remote),