From 4999cf0efb94a25a557e179ca53d301e754be04b Mon Sep 17 00:00:00 2001
From: Yan Han <yanha@google.com>
Date: Wed, 14 Apr 2021 19:03:14 +0200
Subject: [PATCH] Don't update volume in AudioService when SAM is on and ARC is
 off

This prevents volume from changing on TV panels when a connected
amplifier sends <Report Audio Status>.

Tests omitted because of AOSP incompatibilities.

Test: manual with Isto and Atom
Bug: 182369742

Change-Id: I412ee9d5b1ba7aab382e73deab8ac19546175842
Merged-In: I412ee9d5b1ba7aab382e73deab8ac19546175842
---
 .../core/java/com/android/server/hdmi/HdmiControlService.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index 16d4f94277cb1..cca8be8a1bea5 100644
--- 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;
         }