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

Commit d8720e8f authored by Yan Han's avatar Yan Han Committed by Automerger Merge Worker
Browse files

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

Merge "TV: Fix infinite mute/unmute cycle on connected AVR" into main am: 040e8387 am: 253d9336 am: 0f1a543e am: cee38a84

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2652645



Change-Id: I930b53a0b1a659f9d100e62168b951e55c99a6f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 216e1fe6 cee38a84

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

+8 −2
Original line number Diff line number Diff line
@@ -3603,8 +3603,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;