diff options
| author | 2023-06-02 12:08:00 +0000 | |
|---|---|---|
| committer | 2023-06-02 12:08:00 +0000 | |
| commit | e20d8b2c546b07b0ee007eb84e450deb89ca96cd (patch) | |
| tree | fe5c3572090903a61957e808f4ee69726210c2c1 | |
| parent | fa1378eb231932fc078197354ea016c349ab0b71 (diff) | |
| parent | 92bfccd9021506f02d128fb7b0a5ef9e5e09338c (diff) | |
Merge "Change sendVolumeKeyEvent condition"
| -rw-r--r-- | services/core/java/com/android/server/audio/AudioService.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index 66682cceb3f0..a54b59c4a2d3 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -3409,16 +3409,15 @@ public class AudioService extends IAudioService.Stub synchronized (mHdmiClientLock) { if (mHdmiManager != null) { // At most one of mHdmiPlaybackClient and mHdmiTvClient should be non-null - HdmiClient fullVolumeHdmiClient = mHdmiPlaybackClient; + HdmiClient hdmiClient = mHdmiPlaybackClient; if (mHdmiTvClient != null) { - fullVolumeHdmiClient = mHdmiTvClient; + hdmiClient = mHdmiTvClient; } - if (fullVolumeHdmiClient != null + if (((mHdmiPlaybackClient != null && isFullVolumeDevice(device)) + || (mHdmiTvClient != null && mHdmiSystemAudioSupported)) && mHdmiCecVolumeControlEnabled - && streamTypeAlias == AudioSystem.STREAM_MUSIC - // vol change on a full volume device - && isFullVolumeDevice(device)) { + && streamTypeAlias == AudioSystem.STREAM_MUSIC) { int keyCode = KeyEvent.KEYCODE_UNKNOWN; switch (direction) { case AudioManager.ADJUST_RAISE: @@ -3442,14 +3441,14 @@ public class AudioService extends IAudioService.Stub try { switch (keyEventMode) { case AudioDeviceVolumeManager.ADJUST_MODE_NORMAL: - fullVolumeHdmiClient.sendVolumeKeyEvent(keyCode, true); - fullVolumeHdmiClient.sendVolumeKeyEvent(keyCode, false); + hdmiClient.sendVolumeKeyEvent(keyCode, true); + hdmiClient.sendVolumeKeyEvent(keyCode, false); break; case AudioDeviceVolumeManager.ADJUST_MODE_START: - fullVolumeHdmiClient.sendVolumeKeyEvent(keyCode, true); + hdmiClient.sendVolumeKeyEvent(keyCode, true); break; case AudioDeviceVolumeManager.ADJUST_MODE_END: - fullVolumeHdmiClient.sendVolumeKeyEvent(keyCode, false); + hdmiClient.sendVolumeKeyEvent(keyCode, false); break; default: Log.e(TAG, "Invalid keyEventMode " + keyEventMode); |