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

Commit 9d6548d1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "CEC: Prevent overwriting volume control Settings" into rvc-dev am:... 

Merge "CEC: Prevent overwriting volume control Settings" into rvc-dev am: 58fd58de am: e250de15 am: 67a77722

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

Change-Id: I1b7fa6f6ee7edb12f815d7011d42d0315ef26732
parents 78838867 67a77722

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

+1 −1
Original line number Diff line number Diff line
@@ -3130,7 +3130,7 @@ public class HdmiControlService extends SystemService { 
            return;

        }



        setHdmiCecVolumeControlEnabled(false);

        mHdmiCecVolumeControlEnabled = false;

        // Call the vendor handler before the service is disabled.

        invokeVendorCommandListenersOnControlStateChanged(false,

                HdmiControlManager.CONTROL_STATE_CHANGED_REASON_SETTING);

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

+13 −0
Original line number Diff line number Diff line
@@ -263,6 +263,19 @@ public class HdmiControlServiceTest { 
        assertThat(mHdmiControlService.isHdmiCecVolumeControlEnabled()).isTrue();

    }



    @Test

    public void disableAndReenableCec_volumeControlReturnsToOriginalValue() {

        boolean volumeControlEnabled = true;

        mHdmiControlService.setHdmiCecVolumeControlEnabled(volumeControlEnabled);



        mHdmiControlService.setControlEnabled(false);

        assertThat(mHdmiControlService.isHdmiCecVolumeControlEnabled()).isFalse();



        mHdmiControlService.setControlEnabled(true);

        assertThat(mHdmiControlService.isHdmiCecVolumeControlEnabled()).isEqualTo(

                volumeControlEnabled);

    }



    @Test

    public void addHdmiCecVolumeControlFeatureListener_emitsCurrentState_enabled() {

        mHdmiControlService.setHdmiCecVolumeControlEnabled(true);