commit 040e83876d7d049c3db749dd1fe11e91c29c3fea
author Yan Han <yanha@google.com> Wed Jul 26 11:56:22 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 26 11:56:22 2023 +0000
tree fbf6eb0c79d6d6afce81179f7e06c43947598444
parent 5c4b87083d38eed207406e9cee765752c0386dd8
parent 4fa633637b7ee4785ba651bd42ccc2464498806a

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

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

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index b83ab38..4c234a0 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -3449,8 +3449,14 @@
                         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;