Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change sendVolumeKeyEvent condition"

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-02 12:08:00 +00:00
committed by Gerrit Code Review
parent fa1378eb23 92bfccd902
commit e20d8b2c54
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -3409,16 +3409,15 @@ public class AudioService extends IAudioService.Stub
synchronized (mHdmiClientLock) { synchronized (mHdmiClientLock) {
if (mHdmiManager != null) { if (mHdmiManager != null) {
// At most one of mHdmiPlaybackClient and mHdmiTvClient should be non-null // At most one of mHdmiPlaybackClient and mHdmiTvClient should be non-null
HdmiClient fullVolumeHdmiClient = mHdmiPlaybackClient; HdmiClient hdmiClient = mHdmiPlaybackClient;
if (mHdmiTvClient != null) { if (mHdmiTvClient != null) {
fullVolumeHdmiClient = mHdmiTvClient; hdmiClient = mHdmiTvClient;
} }
if (fullVolumeHdmiClient != null if (((mHdmiPlaybackClient != null && isFullVolumeDevice(device))
|| (mHdmiTvClient != null && mHdmiSystemAudioSupported))
&& mHdmiCecVolumeControlEnabled && mHdmiCecVolumeControlEnabled
&& streamTypeAlias == AudioSystem.STREAM_MUSIC && streamTypeAlias == AudioSystem.STREAM_MUSIC) {
// vol change on a full volume device
&& isFullVolumeDevice(device)) {
int keyCode = KeyEvent.KEYCODE_UNKNOWN; int keyCode = KeyEvent.KEYCODE_UNKNOWN;
switch (direction) { switch (direction) {
case AudioManager.ADJUST_RAISE: case AudioManager.ADJUST_RAISE:
@@ -3442,14 +3441,14 @@ public class AudioService extends IAudioService.Stub
try { try {
switch (keyEventMode) { switch (keyEventMode) {
case AudioDeviceVolumeManager.ADJUST_MODE_NORMAL: case AudioDeviceVolumeManager.ADJUST_MODE_NORMAL:
fullVolumeHdmiClient.sendVolumeKeyEvent(keyCode, true); hdmiClient.sendVolumeKeyEvent(keyCode, true);
fullVolumeHdmiClient.sendVolumeKeyEvent(keyCode, false); hdmiClient.sendVolumeKeyEvent(keyCode, false);
break; break;
case AudioDeviceVolumeManager.ADJUST_MODE_START: case AudioDeviceVolumeManager.ADJUST_MODE_START:
fullVolumeHdmiClient.sendVolumeKeyEvent(keyCode, true); hdmiClient.sendVolumeKeyEvent(keyCode, true);
break; break;
case AudioDeviceVolumeManager.ADJUST_MODE_END: case AudioDeviceVolumeManager.ADJUST_MODE_END:
fullVolumeHdmiClient.sendVolumeKeyEvent(keyCode, false); hdmiClient.sendVolumeKeyEvent(keyCode, false);
break; break;
default: default:
Log.e(TAG, "Invalid keyEventMode " + keyEventMode); Log.e(TAG, "Invalid keyEventMode " + keyEventMode);