From 72ef5ad4ad245a73330289d419c5a4a42611e201 Mon Sep 17 00:00:00 2001
From: roynatech2544 <whiteshell2544@naver.com>
Date: Wed, 10 Nov 2021 18:17:15 +0900
Subject: [PATCH] universal7885: audio: Use new audio policy xml file (7.0)

https://github.com/SamarV-121/android_device_samsung_universal7885-common/commit/6ddcc44615c33119c97846251bb15f884de16523
Signed-off-by: roynatech2544 <whiteshell2544@naver.com>
---
 universal7885-common/configs/audio_policy_configuration.xml | 4 ++--
 universal7885-common/universal7885-common.mk                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/universal7885-common/configs/audio_policy_configuration.xml b/universal7885-common/configs/audio_policy_configuration.xml
index 407beef..b6844b7 100644
--- a/universal7885-common/configs/audio_policy_configuration.xml
+++ b/universal7885-common/configs/audio_policy_configuration.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
-<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<audioPolicyConfiguration version="7.0" xmlns:xi="http://www.w3.org/2001/XInclude">
 
     <globalConfiguration speaker_drc_enabled="true"/>
 
@@ -17,7 +17,7 @@
             <defaultOutputDevice>Speaker</defaultOutputDevice>
 
             <mixPorts>
-                <mixPort name="primary-out" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
+                <mixPort name="primary-out" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
diff --git a/universal7885-common/universal7885-common.mk b/universal7885-common/universal7885-common.mk
index d169cf6..23ab9bc 100644
--- a/universal7885-common/universal7885-common.mk
+++ b/universal7885-common/universal7885-common.mk
@@ -22,7 +22,7 @@ PRODUCT_PACKAGES += \
     audio.usb.default 
 
 PRODUCT_COPY_FILES += \
-    frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
+    frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_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 \
     frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \