commit f75e69acf7f8e1863d09bfd5a3ba00866ea258e7
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 12 11:08:36 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 12 11:08:36 2020 +0000
tree 1d9cca1e1a454ddde5fd93e18d121c17ff155859
parent db818cb53c4c3275bcdb7a6cc27c0bd34cf78884
parent 9c9d5235e61391036047a59080695e56970b22e0

Merge "Add null check of MediaDevice"

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 8e6da80..3c9999e 100644
--- a/src/com/android/settings/media/MediaOutputSlice.java
+++ b/src/com/android/settings/media/MediaOutputSlice.java
@@ -104,7 +104,7 @@
     }
 
     private void addRow(MediaDevice device, MediaDevice connectedDevice, ListBuilder listBuilder) {
-        if (TextUtils.equals(device.getId(), connectedDevice.getId())) {
+        if (connectedDevice != null && TextUtils.equals(device.getId(), connectedDevice.getId())) {
             listBuilder.addInputRange(getActiveDeviceHeaderRow(device));
         } else {
             listBuilder.addRow(getMediaDeviceRow(device));