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

Commit 32af0c2a authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix Hdmi Control service" am: 28b71ac4 am: f4540408" into rvc-dev-plus-aosp

parents 21d9507e a35ed65f

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