From cdff4c6313bd934cb9cc0cf45986a37f627444f3 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jrwu@google.com>
Date: Thu, 1 Feb 2024 10:16:29 +0000
Subject: [PATCH] Floss: fix |A2dpCodecConfig| parameters
aosp/2855937 has changed the signature of the constructor, but by that
time Aptx was not built so the changes did not apply.
This CL fixes the signature to allow the build.
Bug: 314227872, 318629095
Test: m Bluetooth
Flag: EXEMPT floss only changes
Change-Id: I488a3778a94a3802ea4885c8e68bbd488d6b3c36
---
system/stack/a2dp/a2dp_vendor_aptx_hd_linux.cc | 3 ++-
system/stack/a2dp/a2dp_vendor_aptx_linux.cc | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/system/stack/a2dp/a2dp_vendor_aptx_hd_linux.cc b/system/stack/a2dp/a2dp_vendor_aptx_hd_linux.cc
index 923d40035db..25731516c7b 100644
--- a/system/stack/a2dp/a2dp_vendor_aptx_hd_linux.cc
+++ b/system/stack/a2dp/a2dp_vendor_aptx_hd_linux.cc
@@ -116,7 +116,8 @@ bool A2DP_VendorInitCodecConfigAptxHd(AvdtpSepConfig* p_cfg) { return false; }
A2dpCodecConfigAptxHd::A2dpCodecConfigAptxHd(
btav_a2dp_codec_priority_t codec_priority)
: A2dpCodecConfig(BTAV_A2DP_CODEC_INDEX_SOURCE_APTX_HD,
- A2DP_VendorCodecIndexStrAptxHd(), codec_priority) {}
+ A2DP_CODEC_ID_APTX_HD, A2DP_VendorCodecIndexStrAptxHd(),
+ codec_priority) {}
A2dpCodecConfigAptxHd::~A2dpCodecConfigAptxHd() {}
diff --git a/system/stack/a2dp/a2dp_vendor_aptx_linux.cc b/system/stack/a2dp/a2dp_vendor_aptx_linux.cc
index 24a68229ee0..0b8b81ed054 100644
--- a/system/stack/a2dp/a2dp_vendor_aptx_linux.cc
+++ b/system/stack/a2dp/a2dp_vendor_aptx_linux.cc
@@ -114,7 +114,7 @@ bool A2DP_VendorInitCodecConfigAptx(AvdtpSepConfig* p_cfg) { return false; }
A2dpCodecConfigAptx::A2dpCodecConfigAptx(
btav_a2dp_codec_priority_t codec_priority)
- : A2dpCodecConfig(BTAV_A2DP_CODEC_INDEX_SOURCE_APTX,
+ : A2dpCodecConfig(BTAV_A2DP_CODEC_INDEX_SOURCE_APTX, A2DP_CODEC_ID_APTX,
A2DP_VendorCodecIndexStrAptx(), codec_priority) {}
A2dpCodecConfigAptx::~A2dpCodecConfigAptx() {}
--
GitLab