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

Browse Source 
am: b0f641869b

Change-Id: I82e8906d672fce4831dde200073db5b763205bee
This commit is contained in:
lindatseng
2019-05-10 01:30:15 -07:00
committed by android-build-merger
parent 21bb8ebde2 b0f641869b
commit f23d16f577
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 List<MediaDevice> devices = getMediaDevices();
final MediaDevice connectedDevice = getWorker().getCurrentConnectedMediaDevice(); final MediaDevice connectedDevice = getWorker().getCurrentConnectedMediaDevice();
listBuilder.addRow(getActiveDeviceHeaderRow(connectedDevice)); if (connectedDevice != null) {
listBuilder.addRow(getActiveDeviceHeaderRow(connectedDevice));
}
for (MediaDevice device : devices) { for (MediaDevice device : devices) {
if (!TextUtils.equals(connectedDevice.getId(), device.getId())) { if (connectedDevice == null
|| !TextUtils.equals(connectedDevice.getId(), device.getId())) {
listBuilder.addRow(getMediaDeviceRow(device)); listBuilder.addRow(getMediaDeviceRow(device));
} }
} }