summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-10-25 23:14:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-10-25 23:14:38 +0000
commitdf438d2260de9b23676584b7e3aad8802bee5d94 (patch)
treeaedcb4c7a9de619fce3ac0f1eb5797b9352381ec
parent22fcc65d0d9005e85ad71c60dbb0b523bb8cd36d (diff)
parentaf3eaa8f250d3086fc9e8447874acf5156219996 (diff)
Merge "Fix to accept volume status with no ARC connection" into main am: af3eaa8f25
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3256356 Change-Id: I60340dcbe82c884a66cb55b21f914730123706a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiControlService.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index bbe7b2b038c9..8436c809337b 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -1975,7 +1975,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;