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

Commit bd05fd4d authored by Sherry Huang's avatar Sherry Huang Committed by Android (Google) Code Review
Browse files

Merge "HDMI: Notify AVB mute atfer adjust volume" into main

parents 373ebfe3 8730054c

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

+4 −4
Original line number Diff line number Diff line
@@ -4821,10 +4821,6 @@ public class HdmiControlService extends SystemService { 
        mAbsoluteVolumeChangedListener = new AbsoluteVolumeChangedListener(

                localDevice, systemAudioDevice);



        // AudioService sets the volume of the stream and device based on the input VolumeInfo

        // when enabling absolute volume behavior, but not the mute state

        notifyAvbMuteChange(audioStatus.getMute());



        // If <Set Audio Volume Level> is supported, enable absolute volume behavior.

        // Otherwise, enable adjust-only AVB on TVs only.

        if (systemAudioDevice.getDeviceFeatures().getSetAudioVolumeLevelSupport()
@@ -4844,6 +4840,10 @@ public class HdmiControlService extends SystemService { 
            }

        }



        // AudioService sets the volume of the stream and device based on the input VolumeInfo

        // when enabling absolute volume behavior, but not the mute state

        notifyAvbMuteChange(audioStatus.getMute());



    }



    private AbsoluteVolumeChangedListener mAbsoluteVolumeChangedListener;