commit e8f1c6c8144ec7b4af51938aff536856b697a7fc
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 05 07:53:51 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 05 07:53:51 2020 +0000
tree 54a302d601f4b31f3a9fe3f22670f3f21a4062c4
parent 5578920e4c930e16349a96d986ac4e8eb3690c59
parent 2fc9fed89c2a0f0e7b2ccad9c5cf899bc6ccc4cf

Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev

src/com/android/settings/media/RemoteMediaSlice.java

diff --git a/src/com/android/settings/media/RemoteMediaSlice.java b/src/com/android/settings/media/RemoteMediaSlice.java
index 55b3e2c..4e442b7 100644
--- a/src/com/android/settings/media/RemoteMediaSlice.java
+++ b/src/com/android/settings/media/RemoteMediaSlice.java
@@ -112,7 +112,8 @@
                     .setTitle(outputTitle)
                     .setSubtitle(mediaDevice.getName())
                     .setTitleItem(emptyIcon, ListBuilder.ICON_IMAGE)
-                    .setPrimaryAction(getMediaOutputSliceAction()));
+                    .setPrimaryAction(getMediaOutputSliceAction(
+                            mediaDevice.getClientPackageName())));
         }
         return listBuilder.build();
     }
@@ -144,10 +145,11 @@
         return primarySliceAction;
     }
 
-    private SliceAction getMediaOutputSliceAction() {
+    private SliceAction getMediaOutputSliceAction(String packageName) {
         final Intent intent = new Intent()
                 .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME, packageName);
         final IconCompat icon = IconCompat.createWithResource(mContext,
                 R.drawable.ic_volume_remote);
         final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext,