Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f am: 363cd6e7fa

Original change: undetermined

Change-Id: I759e474ce368112f3ab9ba4d9bc95349e04eaf10

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

@@ -106,7 +106,9 @@ public class MediaOutputSlice implements CustomSliceable {
             final MediaDevice connectedDevice = worker.getCurrentConnectedMediaDevice();
             if (devices.size() == 1) {
                 // Zero state
-                addRow(connectedDevice, connectedDevice, listBuilder);
+                for (MediaDevice device : devices) {
+                    addRow(device, device, listBuilder);
+                }
                 listBuilder.addRow(getPairNewRow());
             } else {
                 final boolean isTouched = worker.getIsTouched();