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

Commit a8bff8e0 authored by Yan Han's avatar Yan Han
Browse files

Enable volume UI for TVs using Absolute Volume Control. 

HdmiControlService now sets FLAG_SHOW_UI when calling AudioService APIs
on a TV using Absolute Volume Control.

With UI being shown when using Absolute Volume Control, hiding volume UI
is only necessary when system audio mode is enabled, but Absolute Volume
Control is not. This is covered by the check for full volume behavior in
AudioService#sendVolumeUpdate, so the other TV-specific checks can be
removed.

Bug: 231430528
Test: manual
Change-Id: I0579b3af77abe2559b64574e162021320cfb9100
parent dcfe66fd

services/core/java/com/android/server/audio/AudioService.java

+2 −13
Original line number Diff line number Diff line
@@ -4146,20 +4146,9 @@ public class AudioService extends IAudioService.Stub 
    {

        streamType = mStreamVolumeAlias[streamType];



        if (streamType == AudioSystem.STREAM_MUSIC) {

            flags = updateFlagsForTvPlatform(flags);

            synchronized (mHdmiClientLock) {

                // Don't display volume UI on a TV Playback device when using absolute volume

                if (mHdmiCecVolumeControlEnabled && mHdmiPlaybackClient != null

                        && (isAbsoluteVolumeDevice(device)

                        || isA2dpAbsoluteVolumeDevice(device))) {

                    flags &= ~AudioManager.FLAG_SHOW_UI;

                }

            }

            if (isFullVolumeDevice(device)) {

        if (streamType == AudioSystem.STREAM_MUSIC && isFullVolumeDevice(device)) {

            flags &= ~AudioManager.FLAG_SHOW_UI;

        }

        }

        mVolumeController.postVolumeChanged(streamType, flags);

    }

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

+10 −3
Original line number Diff line number Diff line
@@ -4176,7 +4176,11 @@ public class HdmiControlService extends SystemService { 
        List<AudioDeviceAttributes> streamMusicDevices =

                getAudioManager().getDevicesForAttributes(STREAM_MUSIC_ATTRIBUTES);

        if (streamMusicDevices.contains(getAvcAudioOutputDevice())) {

            setStreamMusicVolume(volume, AudioManager.FLAG_ABSOLUTE_VOLUME);

            int flags = AudioManager.FLAG_ABSOLUTE_VOLUME;

            if (isTvDevice()) {

                flags |= AudioManager.FLAG_SHOW_UI;

            }

            setStreamMusicVolume(volume, flags);

        }

    }
@@ -4190,8 +4194,11 @@ public class HdmiControlService extends SystemService { 
                getAudioManager().getDevicesForAttributes(STREAM_MUSIC_ATTRIBUTES);

        if (streamMusicDevices.contains(getAvcAudioOutputDevice())) {

            int direction = mute ? AudioManager.ADJUST_MUTE : AudioManager.ADJUST_UNMUTE;

            getAudioManager().adjustStreamVolume(AudioManager.STREAM_MUSIC, direction,

                    AudioManager.FLAG_ABSOLUTE_VOLUME);

            int flags = AudioManager.FLAG_ABSOLUTE_VOLUME;

            if (isTvDevice()) {

                flags |= AudioManager.FLAG_SHOW_UI;

            }

            getAudioManager().adjustStreamVolume(AudioManager.STREAM_MUSIC, direction, flags);

        }

    }