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

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

Browse Source 
am: f23d16f577

Change-Id: Icb002de55edacad63a1f7f2802d92e72cf2fc0fd
This commit is contained in:
lindatseng
2019-05-10 05:41:44 -07:00
committed by android-build-merger
parent 65f6968cb2 f23d16f577
commit 69b35fe896
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,10 +90,13 @@ public class MediaOutputSlice implements CustomSliceable {
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));
}
}