Merge "Don't update volume in AudioService when SAM is on and ARC is off"

2021-04-20 10:44:34 +00:00
parent 1f43a69d91 4999cf0efb
commit 461594522b
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -1289,6 +1289,7 @@ public class HdmiControlService extends SystemService {
    void setAudioStatus(boolean mute, int volume) {
        if (!isTvDeviceEnabled()
                || !tv().isSystemAudioActivated()
+                || !tv().isArcEstablished() // Don't update TV volume when SAM is on and ARC is off
                || !isHdmiCecVolumeControlEnabled()) {
            return;
        }