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

2023-07-26 11:56:22 +00:00
parent 5c4b87083d 4fa633637b
commit 040e83876d
1 changed files with 8 additions and 2 deletions
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -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;