Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3af62d24 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Don't update volume in AudioService when SAM is on and ARC is off" am: 46159452 am: 2171996c

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

Change-Id: I9f238154a1d5193c3a16c499f41e0c83a3af4819
parents 890dbd12 2171996c

services/core/java/com/android/server/hdmi/HdmiControlService.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

        }