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

Commit 069c0fa8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix to accept volume status with no ARC connection" into main am: af3eaa8f am: df438d22 

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



Change-Id: I59ed4213d59d44414e7fb5a0253fc431971c4275
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a1520e3a df438d22

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

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

                || getHdmiCecVolumeControl()

                == HdmiControlManager.VOLUME_CONTROL_DISABLED) {

            return;