Merge "Merge "CEC: Make TV try to dispatch the message first" am: aa3970209e... (cbf14558) · Commits · e / os / android_frameworks_base

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

+10 −9

Original line number	Diff line number	Diff line
		@@ -307,19 +307,19 @@ public class HdmiControlService extends SystemService {
		private final class CecMessageBuffer {
		private List<HdmiCecMessage> mBuffer = new ArrayList<>();

		public void bufferMessage(HdmiCecMessage message) {
		public boolean bufferMessage(HdmiCecMessage message) {
		switch (message.getOpcode()) {
		case Constants.MESSAGE_ACTIVE_SOURCE:
		bufferActiveSource(message);
		break;
		return true;
		case Constants.MESSAGE_IMAGE_VIEW_ON:
		case Constants.MESSAGE_TEXT_VIEW_ON:
		bufferImageOrTextViewOn(message);
		break;
		return true;
		// Add here if new message that needs to buffer
		default:
		// Do not need to buffer messages other than above
		break;
		return false;
		}
		}

		@@ -906,10 +906,6 @@ public class HdmiControlService extends SystemService {
		@ServiceThreadOnly
		boolean handleCecCommand(HdmiCecMessage message) {
		assertRunOnServiceThread();
		if (!mAddressAllocated) {
		mCecMessageBuffer.bufferMessage(message);
		return true;
		}
		int errorCode = mMessageValidator.isValid(message);
		if (errorCode != HdmiCecMessageValidator.OK) {
		// We'll not response on the messages with the invalid source or destination
		@@ -919,7 +915,12 @@ public class HdmiControlService extends SystemService {
		}
		return true;
		}
		return dispatchMessageToLocalDevice(message);

		if (dispatchMessageToLocalDevice(message)) {
		return true;
		}

		return (!mAddressAllocated) ? mCecMessageBuffer.bufferMessage(message) : false;
		}

		void enableAudioReturnChannel(int portId, boolean enabled) {