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

Commit c5fe1f6c authored by Paul Colta's avatar Paul Colta Committed by Android (Google) Code Review
Browse files

Merge "HDMI: Improve validation for <Set System Audio Mode>" into main

parents 0f6c9281 6732f1bc

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

+1 −2
Original line number Diff line number Diff line
@@ -269,8 +269,7 @@ public class HdmiCecMessageValidator { 
        addValidationInfo(Constants.MESSAGE_REQUEST_SHORT_AUDIO_DESCRIPTOR,

                oneByteValidator, ADDR_NOT_UNREGISTERED, ADDR_DIRECT);

        addValidationInfo(Constants.MESSAGE_SET_SYSTEM_AUDIO_MODE,

                new MinimumOneByteRangeValidator(0x00, 0x01),

                ADDR_NOT_UNREGISTERED, ADDR_ALL);

                new SingleByteRangeValidator(0x00, 0x01), ADDR_AUDIO_SYSTEM, ADDR_ALL);

        addValidationInfo(Constants.MESSAGE_SYSTEM_AUDIO_MODE_STATUS,

                new SingleByteRangeValidator(0x00, 0x01), ADDR_NOT_UNREGISTERED,

                ADDR_DIRECT);

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

+6 −5
Original line number Diff line number Diff line
@@ -139,12 +139,13 @@ public class HdmiCecMessageValidatorTest { 


    @Test

    public void isValid_setSystemAudioMode() {

        assertMessageValidity("40:72:00").isEqualTo(OK);

        assertMessageValidity("4F:72:01:03").isEqualTo(OK);

        assertMessageValidity("50:72:00").isEqualTo(OK);

        assertMessageValidity("50:72:01").isEqualTo(OK);

        assertMessageValidity("5F:72:01:03").isEqualTo(ERROR_PARAMETER_LONG);



        assertMessageValidity("F0:72").isEqualTo(ERROR_SOURCE);

        assertMessageValidity("40:72").isEqualTo(ERROR_PARAMETER_SHORT);

        assertMessageValidity("40:72:02").isEqualTo(ERROR_PARAMETER);

        assertMessageValidity("40:72:00").isEqualTo(ERROR_SOURCE);

        assertMessageValidity("50:72").isEqualTo(ERROR_PARAMETER_SHORT);

        assertMessageValidity("50:72:02").isEqualTo(ERROR_PARAMETER);

    }



    @Test