diff options
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 19d7da49d375..e38670cb3d3a 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -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; |