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

Commit 2e72d19b authored by Paul Colta's avatar Paul Colta
Browse files

HDMI: Invalidate physical address 0xFFFF 

Bug: 377497593
Test: atest com.android.server.hdmi
Flag: EXEMPT bugfix
Change-Id: I36e370977435af764f7152b0a1c3d13719f3ad60
parent 5555f7c8

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

+3 −0
Original line number Diff line number Diff line
@@ -390,6 +390,9 @@ public class HdmiCecMessageValidator { 


    private static boolean isValidPhysicalAddress(byte[] params, int offset) {

        int physicalAddress = HdmiUtils.twoBytesToInt(params, offset);

        if (physicalAddress == 0xFFFF) {

            return false;

        }

        while (physicalAddress != 0) {

            int maskedAddress = physicalAddress & 0xF000;

            physicalAddress = (physicalAddress << 4) & 0xFFFF;

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

+1 −0
Original line number Diff line number Diff line
@@ -627,6 +627,7 @@ public class HdmiCecMessageValidatorTest { 
        assertMessageValidity("4F:81:13:05").isEqualTo(ERROR_PARAMETER);

        assertMessageValidity("4F:86:10:14").isEqualTo(ERROR_PARAMETER);

        assertMessageValidity("0F:86:10:24").isEqualTo(ERROR_PARAMETER);

        assertMessageValidity("8F:86:FF:FF").isEqualTo(ERROR_PARAMETER);

    }



    @Test