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

Commit 00ce1690 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: 9e89d139

Change-Id: I20534d988badea0727c66c7e2b7e94fef5b1ab88
parents 6b79955d 9e89d139

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