summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-10-25 23:11:28 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-10-25 23:11:28 +0000
commitaf3eaa8f250d3086fc9e8447874acf5156219996 (patch)
tree8dc91ddb8d6fd581b4251371a7605080b6908794
parent66db8f0e3432fd5e7b57dc16220862616cfa1b5c (diff)
parentd8c82ad3a25ad12a75e7505d65ffc86cac5f0fb4 (diff)
Merge "Fix to accept volume status with no ARC connection" into main
-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;