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

CEC: Allow no parameters with <System Audio Mode Request>.

Browse Source 
automerge: 0361147

* commit '03611473bc1d13f8e55ac92e37a9716c2fd8e412':
  CEC: Allow no parameters with <System Audio Mode Request>.
This commit is contained in:
Yuncheol Heo
2014-11-06 10:21:09 +00:00
committed by android-build-merger
parent 8fafe7b454 03611473bc
commit 9188df6ef0
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java
View File

@@ -79,7 +79,7 @@ public final class HdmiCecMessageValidator {
addValidationInfo(Constants.MESSAGE_SET_STREAM_PATH, addValidationInfo(Constants.MESSAGE_SET_STREAM_PATH,
physicalAddressValidator, DEST_BROADCAST); physicalAddressValidator, DEST_BROADCAST);
addValidationInfo(Constants.MESSAGE_SYSTEM_AUDIO_MODE_REQUEST, addValidationInfo(Constants.MESSAGE_SYSTEM_AUDIO_MODE_REQUEST,
physicalAddressValidator, DEST_DIRECT); new SystemAudioModeRequestValidator(), DEST_DIRECT);
// Messages have no parameter. // Messages have no parameter.
FixedLengthValidator noneValidator = new FixedLengthValidator(0); FixedLengthValidator noneValidator = new FixedLengthValidator(0);
@@ -303,6 +303,17 @@ public final class HdmiCecMessageValidator {
} }
} }
private class SystemAudioModeRequestValidator extends PhysicalAddressValidator {
@Override
public int isValid(byte[] params) {
// TV can send <System Audio Mode Request> with no parameters to terminate system audio.
if (params.length == 0) {
return OK;
}
return super.isValid(params);
}
}
private class ReportPhysicalAddressValidator implements ParameterValidator { private class ReportPhysicalAddressValidator implements ParameterValidator {
@Override @Override
public int isValid(byte[] params) { public int isValid(byte[] params) {