Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0f64186 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents c6ebdfe9 33c5d72f

src/com/android/settings/media/MediaOutputSlice.java

+5 −2
Original line number Diff line number Diff line
@@ -90,10 +90,13 @@ public class MediaOutputSlice implements CustomSliceable { 
        final List<MediaDevice> devices = getMediaDevices();



        final MediaDevice connectedDevice = getWorker().getCurrentConnectedMediaDevice();

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

            }

        }