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

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

Browse Source
This commit is contained in:
Yan Han
2023-07-26 11:56:22 +00:00
committed by Gerrit Code Review
parent 5c4b87083d 4fa633637b
commit 040e83876d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3449,8 +3449,14 @@ public class AudioService extends IAudioService.Stub
hdmiClient = mHdmiTvClient; hdmiClient = mHdmiTvClient;
} }
if (((mHdmiPlaybackClient != null && isFullVolumeDevice(device)) boolean playbackDeviceConditions = mHdmiPlaybackClient != null
|| (mHdmiTvClient != null && mHdmiSystemAudioSupported)) && isFullVolumeDevice(device);
boolean tvConditions = mHdmiTvClient != null
&& mHdmiSystemAudioSupported
&& !isAbsoluteVolumeDevice(device)
&& !isA2dpAbsoluteVolumeDevice(device);
if ((playbackDeviceConditions || tvConditions)
&& mHdmiCecVolumeControlEnabled && mHdmiCecVolumeControlEnabled
&& streamTypeAlias == AudioSystem.STREAM_MUSIC) { && streamTypeAlias == AudioSystem.STREAM_MUSIC) {
int keyCode = KeyEvent.KEYCODE_UNKNOWN; int keyCode = KeyEvent.KEYCODE_UNKNOWN;