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

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

Merge "Fix Hdmi Control service" am: 28b71ac4 am: f4540408 

Change-Id: I1b5b35cf13fdfb18cf246b7eceb98a2e2c4f1359
parents 23c453c5 f4540408

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

+0 −6
Original line number Diff line number Diff line
@@ -768,9 +768,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);
@@ -1185,9 +1182,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);