summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author an.xi <an.xi@amlogic.com> 2024-09-05 16:12:09 +0800
committer Sherry Huang <sherrhxr@google.com> 2024-09-05 11:11:53 -0700
commit77d047831d4be697b66f5e5d56d824cae6621c35 (patch)
tree87d1422e2c33b0d08baa5d9b583dade9edb5c216
parent3f06b5600510d660ce2b0b4abd4f53971e476027 (diff)
HDMI-CEC: Restore full volume device condition to send cec volume keys [1/1]
Volume adjustment is done on AVR while a headphone is connected. The current output audio device is already updated from hdmi_arc to headphone. This patch adds full volume check for a tv device, such that it only send cec volume keyevents when current device is a full volume device. Test: verified by vendor Bug: b/359078216 Flag: EXEMPT bugfix Change-Id: Iac4f6f4bf53733ee54ceb8f2da2885b21272dcfc Signed-off-by: an.xi <an.xi@amlogic.com>
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 4e24cf38fe73..b43a0fd16e4a 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -285,7 +285,6 @@ import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.CancellationException;
-import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
@@ -4004,6 +4003,7 @@ public class AudioService extends IAudioService.Stub
&& isFullVolumeDevice(device);
boolean tvConditions = mHdmiTvClient != null
&& mHdmiSystemAudioSupported
+ && isFullVolumeDevice(device)
&& !isAbsoluteVolumeDevice(device)
&& !isA2dpAbsoluteVolumeDevice(device);