Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CEC: Handle <Active Source> from AVR properly" into nyc-dev

Browse Source
This commit is contained in:
Donghyun Cho
2016-05-11 06:20:08 +00:00
committed by Android (Google) Code Review
parent df9bf7da82 455f09d818
commit f09fcff8d4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
View File

@@ -499,13 +499,14 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
HdmiLogger.debug("Device info %X not found; buffering the command", logicalAddress); HdmiLogger.debug("Device info %X not found; buffering the command", logicalAddress);
mDelayedMessageBuffer.add(message); mDelayedMessageBuffer.add(message);
} }
} else if (!isInputReady(info.getId())) { } else if (isInputReady(info.getId())
HdmiLogger.debug("Input not ready for device: %X; buffering the command", info.getId()); || info.getDeviceType() == HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM) {
mDelayedMessageBuffer.add(message);
} else {
updateDevicePowerStatus(logicalAddress, HdmiControlManager.POWER_STATUS_ON); updateDevicePowerStatus(logicalAddress, HdmiControlManager.POWER_STATUS_ON);
ActiveSource activeSource = ActiveSource.of(logicalAddress, physicalAddress); ActiveSource activeSource = ActiveSource.of(logicalAddress, physicalAddress);
ActiveSourceHandler.create(this, null).process(activeSource, info.getDeviceType()); ActiveSourceHandler.create(this, null).process(activeSource, info.getDeviceType());
} else {
HdmiLogger.debug("Input not ready for device: %X; buffering the command", info.getId());
mDelayedMessageBuffer.add(message);
} }
return true; return true;
} }