Merge "Fix Hdmi Control service" am: 28b71ac415

Change-Id: Id8de7bb57947fb7be875930613cf078444ea7ce4
This commit is contained in:
Treehugger Robot
2020-04-20 18:14:04 +00:00
committed by Automerger Merge Worker

View File

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