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

Commit 9bde85a1 authored by Shraddha Basantwani's avatar Shraddha Basantwani
Browse files

CEC : Add validators for timer cleared status message 

Test: atest HdmiCecMessageValidatorTest
Bug: 170811408
Change-Id: Ia8944415eb25c9161f07fde8ec59246cfd8d082c
parent a5e8c275

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

+19 −0
Original line number Diff line number Diff line
@@ -137,6 +137,10 @@ public class HdmiCecMessageValidator { 
                Constants.MESSAGE_SET_EXTERNAL_TIMER, new ExternalTimerValidator(), DEST_DIRECT);

        addValidationInfo(

                Constants.MESSAGE_SET_TIMER_PROGRAM_TITLE, new AsciiValidator(1, 14), DEST_DIRECT);

        addValidationInfo(

                Constants.MESSAGE_TIMER_CLEARED_STATUS,

                new TimerClearedStatusValidator(),

                DEST_DIRECT);



        // Messages for the System Information.

        FixedLengthValidator oneByteValidator = new FixedLengthValidator(1);
@@ -790,4 +794,19 @@ public class HdmiCecMessageValidator { 
                            && isValidExternalSource(params, 7)); // External Source

        }

    }



    /**

     * Check if the given timer cleared status parameter is valid. A valid parameter should lie

     * within the range description defined in CEC 1.4 Specification : Operand Descriptions

     * (Section 17)

     */

    private class TimerClearedStatusValidator implements ParameterValidator {

        @Override

        public int isValid(byte[] params) {

            if (params.length < 1) {

                return ERROR_PARAMETER_SHORT;

            }

            return toErrorCode(isWithinRange(params[0], 0x00, 0x02) || (params[0] & 0xFF) == 0x80);

        }

    }

}

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

+11 −0
Original line number Diff line number Diff line
@@ -318,6 +318,17 @@ public class HdmiCecMessageValidatorTest { 
        assertMessageValidity("04:A1:0C:08:15:05:04:1E:02:04:00").isEqualTo(ERROR_PARAMETER);

    }



    @Test

    public void isValid_timerClearedStatus() {

        assertMessageValidity("40:43:01:7E").isEqualTo(OK);

        assertMessageValidity("40:43:80").isEqualTo(OK);



        assertMessageValidity("4F:43:01").isEqualTo(ERROR_DESTINATION);

        assertMessageValidity("F0:43:80").isEqualTo(ERROR_SOURCE);

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

        assertMessageValidity("40:43:03").isEqualTo(ERROR_PARAMETER);

    }



    private IntegerSubject assertMessageValidity(String message) {

        return assertThat(mHdmiCecMessageValidator.isValid(buildMessage(message)));

    }