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

Commit 3d379cc5 authored by Paul Colța's avatar Paul Colța Committed by Android (Google) Code Review
Browse files

Merge "HDMI: Allow <Active Source> from recorder"

parents b6a6d858 cab00916

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

+1 −2
Original line number Diff line number Diff line
@@ -99,8 +99,7 @@ public class HdmiCecMessageValidator { 
        // Messages related to the physical address.

        PhysicalAddressValidator physicalAddressValidator = new PhysicalAddressValidator();

        addValidationInfo(Constants.MESSAGE_ACTIVE_SOURCE,

                physicalAddressValidator, ADDR_ALL ^ (ADDR_RECORDER_1 | ADDR_RECORDER_2

                        | ADDR_AUDIO_SYSTEM | ADDR_RECORDER_3), ADDR_BROADCAST);

                physicalAddressValidator, ADDR_ALL ^ ADDR_AUDIO_SYSTEM, ADDR_BROADCAST);

        addValidationInfo(Constants.MESSAGE_INACTIVE_SOURCE,

                physicalAddressValidator, ADDR_NOT_UNREGISTERED, ADDR_DIRECT);

        addValidationInfo(Constants.MESSAGE_REPORT_PHYSICAL_ADDRESS,

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

+1 −10
Original line number Diff line number Diff line
@@ -18,9 +18,6 @@ package com.android.server.hdmi; 


import static com.android.server.hdmi.Constants.ADDR_AUDIO_SYSTEM;

import static com.android.server.hdmi.Constants.ADDR_BROADCAST;

import static com.android.server.hdmi.Constants.ADDR_RECORDER_1;

import static com.android.server.hdmi.Constants.ADDR_RECORDER_2;

import static com.android.server.hdmi.Constants.ADDR_RECORDER_3;

import static com.android.server.hdmi.HdmiCecMessageValidator.ERROR_DESTINATION;

import static com.android.server.hdmi.HdmiCecMessageValidator.ERROR_PARAMETER;

import static com.android.server.hdmi.HdmiCecMessageValidator.ERROR_PARAMETER_LONG;
@@ -43,9 +40,7 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;



import java.util.Arrays;

import java.util.Collections;

import java.util.List;



/** Tests for {@link com.android.server.hdmi.HdmiCecMessageValidator} class. */

@SmallTest
@@ -651,13 +646,9 @@ public class HdmiCecMessageValidatorTest { 


    @Test

    public void isValid_activeSource() {

        // Only source devices should broadcast <Active Source> messages.

        List<Integer> nonSourceDevicesAddresses = Arrays.asList(ADDR_RECORDER_1, ADDR_RECORDER_2,

                ADDR_AUDIO_SYSTEM, ADDR_RECORDER_3);



        for (int i = 0; i < ADDR_BROADCAST; ++i) {

            String message = Integer.toHexString(i) + "F:82:10:00";

            if (nonSourceDevicesAddresses.contains(i)) {

            if (i == ADDR_AUDIO_SYSTEM) {

                assertMessageValidity(message).isEqualTo(ERROR_SOURCE);

            } else {

                assertMessageValidity(message).isEqualTo(OK);