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 
am: f09fcff8d4

* commit 'f09fcff8d40b34171fe88c7ba228e1148ff942ac':
  CEC: Handle <Active Source> from AVR properly

Change-Id: Ib02ac3e1128709f88e642e618f60704c58e7de45
This commit is contained in:
Donghyun Cho
2016-05-11 06:26:35 +00:00
committed by android-build-merger
parent 0ffe2950a4 f09fcff8d4
commit 639eb6ef30
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);
mDelayedMessageBuffer.add(message);
}
} else if (!isInputReady(info.getId())) {
HdmiLogger.debug("Input not ready for device: %X; buffering the command", info.getId());
mDelayedMessageBuffer.add(message);
} else {
} else if (isInputReady(info.getId())
|| info.getDeviceType() == HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM) {
updateDevicePowerStatus(logicalAddress, HdmiControlManager.POWER_STATUS_ON);
ActiveSource activeSource = ActiveSource.of(logicalAddress, physicalAddress);
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;
}