Merge "Only buffer the Active Source coming from the device under the current device" (c642905b) · Commits · e / os / android_frameworks_base

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -446,6 +446,14 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
		assertRunOnServiceThread();
		int logicalAddress = message.getSource();
		int physicalAddress = HdmiUtils.twoBytesToInt(message.getParams());
		if (HdmiUtils.getLocalPortFromPhysicalAddress(
		physicalAddress, mService.getPhysicalAddress())
		== HdmiUtils.TARGET_NOT_UNDER_LOCAL_DEVICE) {
		return super.handleActiveSource(message);
		}
		// If the new Active Source is under the current device, check if the device info and the TV
		// input is ready to switch to the new Active Source. If not ready, buffer the cec command
		// to handle later when the device is ready.
		HdmiDeviceInfo info = getCecDeviceInfo(logicalAddress);
		if (info == null) {
		HdmiLogger.debug("Device info %X not found; buffering the command", logicalAddress);
		@@ -455,7 +463,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
		mDelayedMessageBuffer.add(message);
		} else {
		mDelayedMessageBuffer.removeActiveSource();
		super.handleActiveSource(message);
		return super.handleActiveSource(message);
		}
		return true;
		}