Merge "cec: message buffered before logical addr allocated [1/1]" (9dd7fe76) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -580,7 +580,9 @@ final class HdmiCecController {
		@ServiceThreadOnly
		private void onReceiveCommand(HdmiCecMessage message) {
		assertRunOnServiceThread();
		if (isAcceptableAddress(message.getDestination()) && mService.handleCecCommand(message)) {
		if ((isAcceptableAddress(message.getDestination())
		\|\| !mService.isAddressAllocated())
		&& mService.handleCecCommand(message)) {
		return;
		}
		// Not handled message, so we will reply it with <Feature Abort>.

+9 −0

Original line number	Diff line number	Diff line
		@@ -380,6 +380,9 @@ public class HdmiControlService extends SystemService {
		case Constants.MESSAGE_TEXT_VIEW_ON:
		bufferImageOrTextViewOn(message);
		return true;
		case Constants.MESSAGE_SYSTEM_AUDIO_MODE_REQUEST:
		bufferSystemAudioModeRequest(message);
		return true;
		// Add here if new message that needs to buffer
		default:
		// Do not need to buffer messages other than above
		@@ -412,6 +415,12 @@ public class HdmiControlService extends SystemService {
		}
		}

		private void bufferSystemAudioModeRequest(HdmiCecMessage message) {
		if (!replaceMessageIfBuffered(message, Constants.MESSAGE_SYSTEM_AUDIO_MODE_REQUEST)) {
		mBuffer.add(message);
		}
		}

		// Returns true if the message is replaced
		private boolean replaceMessageIfBuffered(HdmiCecMessage message, int opcode) {
		for (int i = 0; i < mBuffer.size(); i++) {