diff options
| author | 2021-04-20 11:26:31 +0000 | |
|---|---|---|
| committer | 2021-04-20 11:26:31 +0000 | |
| commit | 3af62d24d0e0588396fec90fa72cfa62c8b03cbf (patch) | |
| tree | e7922099f991bc335989112a6f0cdd84b38b157c | |
| parent | 890dbd12059c90ca8446011c66adad49f669e356 (diff) | |
| parent | 2171996c6587cc2cec7f86a2a5d322ce0709ca90 (diff) | |
Merge "Don't update volume in AudioService when SAM is on and ARC is off" am: 461594522b am: 2171996c65
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1678047
Change-Id: I9f238154a1d5193c3a16c499f41e0c83a3af4819
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiControlService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 16d4f94277cb..cca8be8a1bea 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; } |