commit b0f641869bbb6f7ff893058b5d2a81f49c59e50e
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 09 23:58:16 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 09 23:58:16 2019 +0000
tree 2079397e24bf9b43633e382bbf1ed491db0b3a85
parent c6ebdfe98227093423abbcb6be054b2acf72456b
parent 33c5d72ffe45e0b2b0c325ae27eef99985b209b9

Merge "Fix NPE when launching MediaOutput Panel" into qt-dev

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

diff --git a/src/com/android/settings/media/MediaOutputSlice.java b/src/com/android/settings/media/MediaOutputSlice.java
index dee5d62..96f8bc3 100644
--- a/src/com/android/settings/media/MediaOutputSlice.java
+++ b/src/com/android/settings/media/MediaOutputSlice.java
@@ -90,10 +90,13 @@
         final List<MediaDevice> devices = getMediaDevices();
 
         final MediaDevice connectedDevice = getWorker().getCurrentConnectedMediaDevice();
-        listBuilder.addRow(getActiveDeviceHeaderRow(connectedDevice));
+        if (connectedDevice != null) {
+            listBuilder.addRow(getActiveDeviceHeaderRow(connectedDevice));
+        }
 
         for (MediaDevice device : devices) {
-            if (!TextUtils.equals(connectedDevice.getId(), device.getId())) {
+            if (connectedDevice == null
+                    || !TextUtils.equals(connectedDevice.getId(), device.getId())) {
                 listBuilder.addRow(getMediaDeviceRow(device));
             }
         }