PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check of MediaDevice"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-12 11:08:36 +00:00
committed by Android (Google) Code Review
parent db818cb53c 9c9d5235e6
commit f75e69acf7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/media/MediaOutputSlice.java
View File

@@ -104,7 +104,7 @@ public class MediaOutputSlice implements CustomSliceable {
} }
private void addRow(MediaDevice device, MediaDevice connectedDevice, ListBuilder listBuilder) { 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)); listBuilder.addInputRange(getActiveDeviceHeaderRow(device));
} else { } else {
listBuilder.addRow(getMediaDeviceRow(device)); listBuilder.addRow(getMediaDeviceRow(device));