From 2688639b0561378348d9ddbb62ddf74cb2908869 Mon Sep 17 00:00:00 2001
From: Tim Peng <timhypeng@google.com>
Date: Wed, 4 Mar 2020 13:20:15 +0800
Subject: [PATCH] Add package name when launching output switcher from remote
 slice

Bug: 150742783
Test: make -j42 RunSettingsRoboTests
Change-Id: I670870cd314dc9a51d7a9a58837b95b4b8cf8808
---
 src/com/android/settings/media/RemoteMediaSlice.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/media/RemoteMediaSlice.java b/src/com/android/settings/media/RemoteMediaSlice.java
index 55b3e2c97a3..4e442b77a6b 100644
--- a/src/com/android/settings/media/RemoteMediaSlice.java
+++ b/src/com/android/settings/media/RemoteMediaSlice.java
@@ -112,7 +112,8 @@ public class RemoteMediaSlice implements CustomSliceable {
                     .setTitle(outputTitle)
                     .setSubtitle(mediaDevice.getName())
                     .setTitleItem(emptyIcon, ListBuilder.ICON_IMAGE)
-                    .setPrimaryAction(getMediaOutputSliceAction()));
+                    .setPrimaryAction(getMediaOutputSliceAction(
+                            mediaDevice.getClientPackageName())));
         }
         return listBuilder.build();
     }
@@ -144,10 +145,11 @@ public class RemoteMediaSlice implements CustomSliceable {
         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,