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

Commit 040e8387 authored by Yan Han's avatar Yan Han Committed by Gerrit Code Review
Browse files

Merge "TV: Fix infinite mute/unmute cycle on connected AVR" into main

parents 5c4b8708 4fa63363

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

+8 −2
Original line number Diff line number Diff line
@@ -3449,8 +3449,14 @@ public class AudioService extends IAudioService.Stub 
                        hdmiClient = mHdmiTvClient;

                    }













                    if (((mHdmiPlaybackClient != null && isFullVolumeDevice(device))













                            || (mHdmiTvClient != null && mHdmiSystemAudioSupported))













                    boolean playbackDeviceConditions = mHdmiPlaybackClient != null













                            && isFullVolumeDevice(device);













                    boolean tvConditions = mHdmiTvClient != null













                            && mHdmiSystemAudioSupported













                            && !isAbsoluteVolumeDevice(device)













                            && !isA2dpAbsoluteVolumeDevice(device);

























                    if ((playbackDeviceConditions || tvConditions)















                            && mHdmiCecVolumeControlEnabled















                            && streamTypeAlias == AudioSystem.STREAM_MUSIC) {















                        int keyCode = KeyEvent.KEYCODE_UNKNOWN;