Merge "Merge "Fix Hdmi Control service" am: 28b71ac415 am: f4540408c6" into... (a24be4f5) · Commits · e / os / android_frameworks_base

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