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

Commit db3769c4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Set SAM according to TV's settings"

parents d0355e1b 8d3d4689

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

+15 −1
Original line number Diff line number Diff line
@@ -1176,7 +1176,21 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
            // Ignore this message.

            return true;

        }

        setSystemAudioMode(HdmiUtils.parseCommandParamSystemAudioStatus(message));

        boolean tvSystemAudioMode = isSystemAudioControlFeatureEnabled();

        boolean avrSystemAudioMode = HdmiUtils.parseCommandParamSystemAudioStatus(message);

        // Set System Audio Mode according to TV's settings.

        // Handle <System Audio Mode Status> here only when

        // SystemAudioAutoInitiationAction timeout

        HdmiDeviceInfo avr = getAvrDeviceInfo();

        if (avr == null) {

            setSystemAudioMode(false);

        } else if (avrSystemAudioMode != tvSystemAudioMode) {

            addAndStartAction(new SystemAudioActionFromTv(this, avr.getLogicalAddress(),

                    tvSystemAudioMode, null));

        } else {

            setSystemAudioMode(tvSystemAudioMode);

        }



        return true;

    }