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

Merge "Change sendVolumeKeyEvent condition" am: e20d8b2c54

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583221

Change-Id: I357d495c522933dc1a27debd9f64d3a23fd7e583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-02 12:54:37 +00:00
committed by Automerger Merge Worker
parent c0213bc2b6 e20d8b2c54
commit d80bd7629a
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

@@ -3444,16 +3444,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:
@@ -3477,14 +3476,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);