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

Commit b32186dd 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: 58fd58de am: 79b501a9 

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

Change-Id: Ibe27c3a50a60c312287674d83d44ce868037e25a
parents bafb66fa 79b501a9

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

+1 −1
Original line number Diff line number Diff line
@@ -3142,7 +3142,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);