commit 9bf5f03fcac133672aaab49ace80ccb6067d0f2f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 13 23:22:36 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 13 23:22:36 2024 +0000
tree 92172ce7d3883537ea700a1628eac675565b5b95
parent 372928b7a9195da97b77a4d381d495b82907f54f
parent 7e313bab4232b7cebeefaaefb90d724214ffa1ba

Snap for 11967491 from 7e313bab4232b7cebeefaaefb90d724214ffa1ba to 24Q3-release

Change-Id: I65be1b1c4206f93e20c7f82738dd2697438fe3fe

src/com/android/systemui/tv/media/TvMediaOutputController.java

diff --git a/src/com/android/systemui/tv/media/TvMediaOutputController.java b/src/com/android/systemui/tv/media/TvMediaOutputController.java
index 5818f1c..fe05b51 100644
--- a/src/com/android/systemui/tv/media/TvMediaOutputController.java
+++ b/src/com/android/systemui/tv/media/TvMediaOutputController.java
@@ -148,7 +148,7 @@
                 addOtherDevicesDivider(finalMediaItems);
                 disconnectedDevicesAdded = true;
             }
-            finalMediaItems.add(new MediaItem(device));
+            finalMediaItems.add(MediaItem.createDeviceMediaItem(device));
         }
         addConnectAnotherDeviceItem(finalMediaItems);
         return finalMediaItems;
@@ -204,26 +204,30 @@
 
         // Add new connected devices at the end, add new disconnected devices at the start
         if (isConnected) {
-            targetMediaItems.addAll(matchingMediaDevices.stream().map(MediaItem::new).toList());
-            targetMediaItems.addAll(newMediaDevices.stream().map(MediaItem::new).toList());
+            targetMediaItems.addAll(
+                    matchingMediaDevices.stream().map(MediaItem::createDeviceMediaItem).toList());
+            targetMediaItems.addAll(
+                    newMediaDevices.stream().map(MediaItem::createDeviceMediaItem).toList());
         } else {
             if (!matchingMediaDevices.isEmpty() || !newMediaDevices.isEmpty()) {
                 addOtherDevicesDivider(targetMediaItems);
             }
-            targetMediaItems.addAll(newMediaDevices.stream().map(MediaItem::new).toList());
-            targetMediaItems.addAll(matchingMediaDevices.stream().map(MediaItem::new).toList());
+            targetMediaItems.addAll(
+                    newMediaDevices.stream().map(MediaItem::createDeviceMediaItem).toList());
+            targetMediaItems.addAll(
+                    matchingMediaDevices.stream().map(MediaItem::createDeviceMediaItem).toList());
         }
     }
 
     private void addOtherDevicesDivider(List<MediaItem> mediaItems) {
-        mediaItems.add(new MediaItem(mContext.getString(
-                R.string.media_output_dialog_other_devices),
-                MediaItem.MediaItemType.TYPE_GROUP_DIVIDER));
+        mediaItems.add(
+                MediaItem.createGroupDividerMediaItem(
+                        mContext.getString(R.string.media_output_dialog_other_devices)));
     }
 
     private void addConnectAnotherDeviceItem(List<MediaItem> mediaItems) {
-        mediaItems.add(new MediaItem(null, MediaItem.MediaItemType.TYPE_GROUP_DIVIDER));
-        mediaItems.add(new MediaItem());
+        mediaItems.add(MediaItem.createGroupDividerMediaItem(/* title */ null));
+        mediaItems.add(MediaItem.createPairNewDeviceMediaItem());
     }
 
     @Override