From 2253170e8ab3aabfa23351506c20c279988d7142 Mon Sep 17 00:00:00 2001
From: Aaron Kling <webgeek1234@gmail.com>
Date: Thu, 18 Aug 2022 23:17:54 -0500
Subject: [PATCH] universal7885: Remove references to a2dp module

APM would fail to parse the config anyway:

  E DevicesFactoryHAL: loadAudioInterface couldn't load audio hw module audio.a2dp (No such file or directory)
  W DevicesFactoryHalHidl: The specified device name is not recognized: "a2dp"
  E AudioFlinger: loadHwModule() error -22 loading module a2dp
  W APM_AudioPolicyManager: could not open HW module a2dp

Change-Id: Iaa1be881cfe8f8474cef0ba46e1b0a62b59e14be
---
 .../configs/audio/audio_policy_configuration.xml                | 2 --
 universal7885-common/universal7885-common.mk                    | 1 -
 2 files changed, 3 deletions(-)

diff --git a/universal7885-common/configs/audio/audio_policy_configuration.xml b/universal7885-common/configs/audio/audio_policy_configuration.xml
index d68f8b4..1e8cf7e 100644
--- a/universal7885-common/configs/audio/audio_policy_configuration.xml
+++ b/universal7885-common/configs/audio/audio_policy_configuration.xml
@@ -82,8 +82,6 @@
             <route type="mix" sink="primary-in" sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,Bt Sco Headset Mic,Aux Device In,Voice Call Mic,FM Mic"/>
          </routes>
       </module>
-      <!-- A2dp Audio HAL -->
-      <xi:include href="a2dp_in_audio_policy_configuration.xml"/>
       <!-- Bluetooth Audio HAL -->
       <xi:include href="bluetooth_audio_policy_configuration.xml"/>
       <!-- Usb Audio HAL -->
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index 763085c..4fbda17 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -31,7 +31,6 @@ PRODUCT_PACKAGES += \
 
 # Audio Configs
 PRODUCT_COPY_FILES += \
-    frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \
     $(LOCAL_PATH)/configs/audio/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
     frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \