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 am: 040e83876d am: 253d933676 am: 0f1a543e0e

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

Change-Id: I24d578f082fab0696f105d87fca8c4b1d6e71888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yan Han
2023-07-26 13:56:27 +00:00
committed by Automerger Merge Worker
parent fa86a66183 0f1a543e0e
commit cee38a8423
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

@@ -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;