Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 564ece5b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14293716

Change-Id: I10d07663ae1c923bb4403de83f4d96d93790aca1
parents 2cefc06c d2c28835

services/core/java/com/android/server/hdmi/HdmiCecMessageValidator.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

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

+1 −1
Original line number Diff line number Diff line
@@ -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