From fd5bd59e97df2dff6deb6d22b7b982fe927ed0ec Mon Sep 17 00:00:00 2001 From: Marvin Ramin Date: Fri, 23 Apr 2021 13:31:43 +0200 Subject: [PATCH] Allow Give Features from unregistered address Bug: 169121415 Test: atest Change-Id: I473d7795c108f949ca0fea985397adf71053878c --- .../java/com/android/server/hdmi/HdmiCecMessageValidator.java | 3 ++- .../com/android/server/hdmi/HdmiCecMessageValidatorTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java b/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java index 2bf74c95bcce3..5802e53c67f1c 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java @@ -232,7 +232,8 @@ public class HdmiCecMessageValidator { DEST_DIRECT); // 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), DEST_BROADCAST); diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecMessageValidatorTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecMessageValidatorTest.java index 5b019207688f0..2307a85fe9cd2 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecMessageValidatorTest.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecMessageValidatorTest.java @@ -392,9 +392,9 @@ public class HdmiCecMessageValidatorTest { @Test public void isValid_giveFeatures() { assertMessageValidity("40:A5").isEqualTo(OK); + assertMessageValidity("F0:A5").isEqualTo(OK); assertMessageValidity("4F:A5").isEqualTo(ERROR_DESTINATION); - assertMessageValidity("F0:A5").isEqualTo(ERROR_SOURCE); } @Test