commit 9c9d5235e61391036047a59080695e56970b22e0
author hughchen <hughchen@google.com> Mon Feb 10 19:19:54 2020 +0800
committer hughchen <hughchen@google.com> Mon Feb 10 19:19:54 2020 +0800
tree 82b16e0d6dee0fd5e325a4aa3db8bc5a0beff04c
parent 7233ed3406fabda77cb34b1f4e8511ca58361fcb

Add null check of MediaDevice

Add null check of MediaDevice to avoid some case it would be null.

Bug: 147856563
Test: manually
Change-Id: I86615bb58ccadb8d7741f612ba18afaa178bde6c

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));