From 9c9d5235e61391036047a59080695e56970b22e0 Mon Sep 17 00:00:00 2001
From: hughchen <hughchen@google.com>
Date: Mon, 10 Feb 2020 19:19:54 +0800
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/media/MediaOutputSlice.java b/src/com/android/settings/media/MediaOutputSlice.java
index 8e6da80aae6..3c9999ed3d3 100644
--- a/src/com/android/settings/media/MediaOutputSlice.java
+++ b/src/com/android/settings/media/MediaOutputSlice.java
@@ -104,7 +104,7 @@ public class MediaOutputSlice implements CustomSliceable {
     }
 
     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));