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

Commit 2f7b2335 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Only disable volume UI for TV playback devices in full volume"

parents d07f2fc3 157e1369

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

+2 −3
Original line number Diff line number Diff line
@@ -2956,11 +2956,10 @@ public class AudioService extends IAudioService.Stub 


    // Don't show volume UI when:

    //  - Hdmi-CEC system audio mode is on and we are a TV panel

    //  - CEC volume control enabled on a set-top box

    private int updateFlagsForTvPlatform(int flags) {

        synchronized (mHdmiClientLock) {

            if ((mHdmiTvClient != null && mHdmiSystemAudioSupported && mHdmiCecVolumeControlEnabled)

                    || (mHdmiPlaybackClient != null && mHdmiCecVolumeControlEnabled)) {

            if (mHdmiTvClient != null && mHdmiSystemAudioSupported

                    && mHdmiCecVolumeControlEnabled) {

                flags &= ~AudioManager.FLAG_SHOW_UI;

            }

        }