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

Commit 31d64864 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CEC : Add test to check ARC status" am: 2338a4df am: a2e9b7cd am:... 

Merge "CEC : Add test to check ARC status" am: 2338a4df am: a2e9b7cd am: 1cc5b4ca am: 0e8e7f46

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83d4f7ec3c91c5279fc7679e5a72f6aa6cc8b3db
parents 307a3293 0e8e7f46

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

+0 −1
Original line number Diff line number Diff line
@@ -695,7 +695,6 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 


    @ServiceThreadOnly

    void setArcStatus(boolean enabled) {

        // TODO(shubang): add tests

        assertRunOnServiceThread();



        HdmiLogger.debug("Set Arc Status[old:%b new:%b]", mArcEstablished, enabled);

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

+9 −0
Original line number Diff line number Diff line
@@ -595,6 +595,15 @@ public class HdmiCecLocalDeviceAudioSystemTest { 
        assertThat(mNativeWrapper.getOnlyResultMessage()).isEqualTo(expectedMessage);

    }



    @Test

    public void setArcStatus() {

        mHdmiCecLocalDeviceAudioSystem.setArcStatus(true);

        assertThat(mHdmiCecLocalDeviceAudioSystem.isArcEnabled()).isTrue();



        mHdmiCecLocalDeviceAudioSystem.setArcStatus(false);

        assertThat(mHdmiCecLocalDeviceAudioSystem.isArcEnabled()).isFalse();

    }



    @Test

    @Ignore("b/151150320")

    public void handleSystemAudioModeRequest_fromNonTV_tVNotSupport() {