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

Commit 5716e5ec authored by Paul Colta's avatar Paul Colta
Browse files

HDMI: Fix failing tests under android.hardware.hdmi 

The tests in android.hardware.hdmi will run in presubmits therefore they shall pass.

Test: atest android.hardware.hdmi
Bug: 267164281
Change-Id: Iff3c24b14ba589163fc8a78181e34307480e639d
parent a228a73a

core/java/android/hardware/hdmi/DeviceFeatures.java

+6 −6
Original line number Diff line number Diff line
@@ -130,12 +130,12 @@ public class DeviceFeatures { 
        byte result = 0;



        if (mRecordTvScreenSupport == FEATURE_SUPPORTED) result |= (byte) (1 << 6);

        if (mSetOsdStringSupport == FEATURE_SUPPORTED) result = (byte) (1 << 5);

        if (mDeckControlSupport == FEATURE_SUPPORTED) result = (byte) (1 << 4);

        if (mSetAudioRateSupport == FEATURE_SUPPORTED) result = (byte) (1 << 3);

        if (mArcTxSupport == FEATURE_SUPPORTED) result = (byte) (1 << 2);

        if (mArcRxSupport == FEATURE_SUPPORTED) result = (byte) (1 << 1);

        if (mSetAudioVolumeLevelSupport == FEATURE_SUPPORTED) result = (byte) 1;

        if (mSetOsdStringSupport == FEATURE_SUPPORTED) result |= (byte) (1 << 5);

        if (mDeckControlSupport == FEATURE_SUPPORTED) result |= (byte) (1 << 4);

        if (mSetAudioRateSupport == FEATURE_SUPPORTED) result |= (byte) (1 << 3);

        if (mArcTxSupport == FEATURE_SUPPORTED) result |= (byte) (1 << 2);

        if (mArcRxSupport == FEATURE_SUPPORTED) result |= (byte) (1 << 1);

        if (mSetAudioVolumeLevelSupport == FEATURE_SUPPORTED) result |= (byte) 1;



        return new byte[]{ result };

    }

core/tests/hdmitests/src/android/hardware/hdmi/HdmiPortInfoTest.java

+18 −9
Original line number Diff line number Diff line
@@ -45,54 +45,63 @@ public class HdmiPortInfoTest { 
                                .setCecSupported(isCec)

                                .setMhlSupported(isMhl)

                                .setArcSupported(isArcSupported)

                                .setEarcSupported(isEarcSupported),

                                .setEarcSupported(isEarcSupported)

                                .build(),

                        new HdmiPortInfo.Builder(portId, portType, address)

                                .setCecSupported(isCec)

                                .setMhlSupported(isMhl)

                                .setArcSupported(isArcSupported)

                                .setEarcSupported(isEarcSupported))

                                .setEarcSupported(isEarcSupported)

                                .build())

                .addEqualityGroup(

                        new HdmiPortInfo.Builder(portId + 1, portType, address)

                                .setCecSupported(isCec)

                                .setMhlSupported(isMhl)

                                .setArcSupported(isArcSupported)

                                .setEarcSupported(isEarcSupported))

                                .setEarcSupported(isEarcSupported)

                                .build())

                .addEqualityGroup(

                        new HdmiPortInfo.Builder(portId, portType + 1, address)

                                .setCecSupported(isCec)

                                .setMhlSupported(isMhl)

                                .setArcSupported(isArcSupported)

                                .setEarcSupported(isEarcSupported))

                                .setEarcSupported(isEarcSupported)

                                .build())

                .addEqualityGroup(

                        new HdmiPortInfo.Builder(portId, portType, address + 1)

                                .setCecSupported(isCec)

                                .setMhlSupported(isMhl)

                                .setArcSupported(isArcSupported)

                                .setEarcSupported(isEarcSupported))

                                .setEarcSupported(isEarcSupported)

                                .build())

                .addEqualityGroup(

                        new HdmiPortInfo.Builder(portId, portType, address)

                                .setCecSupported(!isCec)

                                .setMhlSupported(isMhl)

                                .setArcSupported(isArcSupported)

                                .setEarcSupported(isEarcSupported))

                                .setEarcSupported(isEarcSupported)

                                .build())

                .addEqualityGroup(

                        new HdmiPortInfo.Builder(portId, portType, address)

                                .setCecSupported(isCec)

                                .setMhlSupported(!isMhl)

                                .setArcSupported(isArcSupported)

                                .setEarcSupported(isEarcSupported))

                                .setEarcSupported(isEarcSupported)

                                .build())

                .addEqualityGroup(

                        new HdmiPortInfo.Builder(portId, portType, address)

                                .setCecSupported(isCec)

                                .setMhlSupported(isMhl)

                                .setArcSupported(!isArcSupported)

                                .setEarcSupported(isEarcSupported))

                                .setEarcSupported(isEarcSupported)

                                .build())

                .addEqualityGroup(

                        new HdmiPortInfo.Builder(portId, portType, address)

                                .setCecSupported(isCec)

                                .setMhlSupported(isMhl)

                                .setArcSupported(isArcSupported)

                                .setEarcSupported(!isEarcSupported))

                                .setEarcSupported(!isEarcSupported)

                                .build())

                .testEquals();

    }

}