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

Commit 0d0de870 authored by Jay Patel's avatar Jay Patel Committed by android-build-merger
Browse files

Merge "Set SAM To Disabled On HdmiControl Disabled" am: 1bc876bb am:... 

Merge "Set SAM To Disabled On HdmiControl Disabled" am: 1bc876bb am: 9e89d139 am: 00ce1690 am: f465d5a2
am: 7970f366

Change-Id: I4cfbb9a98b23ceddc327696b441288e631624f45
parents 85e6ff9b 7970f366

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

+4 −0
Original line number Diff line number Diff line
@@ -1635,6 +1635,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
        removeAction(SystemAudioAutoInitiationAction.class);

        removeAction(SystemAudioStatusAction.class);

        removeAction(VolumeControlAction.class);



        if (!mService.isControlEnabled()) {

            setSystemAudioMode(false);

        }

    }



    @ServiceThreadOnly