From bf1de21131834fd7f9f1a1529b273a15de035dbc Mon Sep 17 00:00:00 2001
From: Hugh Chen <hughchen@google.com>
Date: Mon, 1 Jun 2020 14:57:09 +0800
Subject: [PATCH] Fix output switch will show empty slice

Use MediaDevice in the list to add row instead of use connectedDevice.
Becauae connectedDevice that got from getCurrentConnectedMediaDevice()
could be null.

Bug: 157611605
Test: make -j42 RunSettingsRoboTests
Change-Id: Ib51e3e436e65a9aaa5a35488191b8b2ad9cb6a4b
---
 src/com/android/settings/media/MediaOutputSlice.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/media/MediaOutputSlice.java b/src/com/android/settings/media/MediaOutputSlice.java
index 5a1afdae95a..82a7bd21490 100644
--- a/src/com/android/settings/media/MediaOutputSlice.java
+++ b/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();