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

Commit f4540408 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Hdmi Control service" am: 28b71ac4 

Change-Id: Id8de7bb57947fb7be875930613cf078444ea7ce4
parents ad37fde5 28b71ac4

services/core/java/com/android/server/hdmi/HdmiControlService.java

+0 −6
Original line number Diff line number Diff line
@@ -710,9 +710,6 @@ public class HdmiControlService extends SystemService { 
        // A container for [Device type, Local device info].

        ArrayList<HdmiCecLocalDevice> localDevices = new ArrayList<>();

        for (int type : mLocalDevices) {

            if (type == HdmiDeviceInfo.DEVICE_PLAYBACK) {

                continue;

            }

            HdmiCecLocalDevice localDevice = mCecController.getLocalDevice(type);

            if (localDevice == null) {

                localDevice = HdmiCecLocalDevice.create(this, type);
@@ -1110,9 +1107,6 @@ public class HdmiControlService extends SystemService { 
            }

            ArrayList<HdmiCecLocalDevice> localDevices = new ArrayList<>();

            for (int type : mLocalDevices) {

                if (type == HdmiDeviceInfo.DEVICE_PLAYBACK) {

                    continue;

                }

                HdmiCecLocalDevice localDevice = mCecController.getLocalDevice(type);

                if (localDevice == null) {

                    localDevice = HdmiCecLocalDevice.create(this, type);