commit 283f6da2c3bfc2467295e50270545a48b4b5e172
author Paul Colta <donpaul@google.com> Tue Sep 17 17:36:09 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 17 17:36:09 2024 +0000
tree 5a17a62231b83786c4a94ca0fdb443644795255d
parent 50d2f4d178b7d59f2354eafe2a9c80ef76e3ee1b
parent 5fc1f1a905d4ac505fc6c82d0cc57d2ba19f683f

Merge "HDMI: On TV panels if DSM is enabled do not allocate an audio system" into main

services/core/java/com/android/server/hdmi/HdmiControlService.java

diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index 164b230..ac75ef7 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -1380,7 +1380,8 @@
     @ServiceThreadOnly
     private List<Integer> getCecLocalDeviceTypes() {
         ArrayList<Integer> allLocalDeviceTypes = new ArrayList<>(mCecLocalDevices);
-        if (isDsmEnabled() && !allLocalDeviceTypes.contains(HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM)
+        if (!isTvDevice() && isDsmEnabled()
+                && !allLocalDeviceTypes.contains(HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM)
                 && isArcSupported() && mSoundbarModeFeatureFlagEnabled) {
             allLocalDeviceTypes.add(HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);
         }