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

Merge "Don't update volume in AudioService when SAM is on and ARC is off" am: 461594522b am: 2171996c65

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

Change-Id: I9f238154a1d5193c3a16c499f41e0c83a3af4819
This commit is contained in:
Treehugger Robot
2021-04-20 11:26:31 +00:00
committed by Automerger Merge Worker
parent 890dbd1205 2171996c65
commit 3af62d24d0
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/hdmi/HdmiControlService.java
View File

@@ -1289,6 +1289,7 @@ public class HdmiControlService extends SystemService {
void setAudioStatus(boolean mute, int volume) { void setAudioStatus(boolean mute, int volume) {
if (!isTvDeviceEnabled() if (!isTvDeviceEnabled()
|| !tv().isSystemAudioActivated() || !tv().isSystemAudioActivated()
|| !tv().isArcEstablished() // Don't update TV volume when SAM is on and ARC is off
|| !isHdmiCecVolumeControlEnabled()) { || !isHdmiCecVolumeControlEnabled()) {
return; return;
} }