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

Merge "Allow Give Features from unregistered address" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-26 11:08:23 +00:00
committed by Android (Google) Code Review
parent 79ff669777 fd5bd59e97
commit d2c28835dd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,7 +232,8 @@ public class HdmiCecMessageValidator {
DEST_DIRECT); DEST_DIRECT);
// Messages for Feature Discovery. // Messages for Feature Discovery.
addValidationInfo(Constants.MESSAGE_GIVE_FEATURES, noneValidator, DEST_DIRECT); addValidationInfo(Constants.MESSAGE_GIVE_FEATURES, noneValidator,
DEST_DIRECT | SRC_UNREGISTERED);
addValidationInfo(Constants.MESSAGE_REPORT_FEATURES, new VariableLengthValidator(4, 14), addValidationInfo(Constants.MESSAGE_REPORT_FEATURES, new VariableLengthValidator(4, 14),
DEST_BROADCAST); DEST_BROADCAST);

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

@@ -392,9 +392,9 @@ public class HdmiCecMessageValidatorTest {
@Test @Test
public void isValid_giveFeatures() { public void isValid_giveFeatures() {
assertMessageValidity("40:A5").isEqualTo(OK); assertMessageValidity("40:A5").isEqualTo(OK);
assertMessageValidity("F0:A5").isEqualTo(OK);
assertMessageValidity("4F:A5").isEqualTo(ERROR_DESTINATION); assertMessageValidity("4F:A5").isEqualTo(ERROR_DESTINATION);
assertMessageValidity("F0:A5").isEqualTo(ERROR_SOURCE);
} }
@Test @Test