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

CEC : Add validator for give tuner device status message

Browse Source 
Reuse status request validator created for <Give Deck Status>.

Test: atest HdmiCecMessageValidatorTest
Bug: 170811408
Change-Id: Ife9ad0433df8893dab0fbe010ef6b4626ff06784
This commit is contained in:
Shraddha Basantwani
2020-11-02 17:37:22 +05:30
parent 5ea0ca572e
commit 9fa633abeb
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,17 +148,17 @@ public class HdmiCecMessageValidator {
addValidationInfo(Constants.MESSAGE_SET_MENU_LANGUAGE,
new AsciiValidator(3), DEST_BROADCAST);
ParameterValidator statusRequestValidator = new OneByteRangeValidator(0x01, 0x03);
addValidationInfo(
Constants.MESSAGE_DECK_CONTROL, new OneByteRangeValidator(0x01, 0x04), DEST_DIRECT);
addValidationInfo(
Constants.MESSAGE_DECK_STATUS, new OneByteRangeValidator(0x11, 0x1F), DEST_DIRECT);
addValidationInfo(
Constants.MESSAGE_GIVE_DECK_STATUS,
new OneByteRangeValidator(0x01, 0x03),
DEST_DIRECT);
addValidationInfo(Constants.MESSAGE_GIVE_DECK_STATUS, statusRequestValidator, DEST_DIRECT);
addValidationInfo(Constants.MESSAGE_PLAY, new PlayModeValidator(), DEST_DIRECT);
// TODO: Handle messages for the Tuner Control.
addValidationInfo(
Constants.MESSAGE_GIVE_TUNER_DEVICE_STATUS, statusRequestValidator, DEST_DIRECT);
// Messages for the Vendor Specific Commands.
VariableLengthValidator maxLengthValidator = new VariableLengthValidator(0, 14);

9
services/tests/servicestests/src/com/android/server/hdmi/HdmiCecMessageValidatorTest.java
View File

@@ -377,13 +377,20 @@ public class HdmiCecMessageValidatorTest {
}
@Test
public void isValid_giveDeckStatus() {
public void isValid_statusRequest() {
assertMessageValidity("40:08:01").isEqualTo(OK);
assertMessageValidity("40:08:02:5C").isEqualTo(OK);
assertMessageValidity("40:1A:01:F8").isEqualTo(OK);
assertMessageValidity("40:1A:03").isEqualTo(OK);
assertMessageValidity("4F:08:01").isEqualTo(ERROR_DESTINATION);
assertMessageValidity("F0:08:03").isEqualTo(ERROR_SOURCE);
assertMessageValidity("4F:1A:01").isEqualTo(ERROR_DESTINATION);
assertMessageValidity("F0:1A:03").isEqualTo(ERROR_SOURCE);
assertMessageValidity("40:08").isEqualTo(ERROR_PARAMETER_SHORT);
assertMessageValidity("40:1A").isEqualTo(ERROR_PARAMETER_SHORT);
assertMessageValidity("40:08:00").isEqualTo(ERROR_PARAMETER);
assertMessageValidity("40:08:05").isEqualTo(ERROR_PARAMETER);
assertMessageValidity("40:1A:00").isEqualTo(ERROR_PARAMETER);
assertMessageValidity("40:1A:04").isEqualTo(ERROR_PARAMETER);
}