commit 09d0db0eee6d1bf0388b4984abcb6bfc885bab5b
author Linux Build Service Account <lnxbuild@localhost> Mon Nov 12 00:59:50 2018 -0800
committer Linux Build Service Account <lnxbuild@localhost> Mon Nov 12 00:59:50 2018 -0800
tree 057339db040848ac9ea5b25f88b4aedb7f7722b5
parent 2c14d68173b71db941d0e674c70a2e3f67fda1a8
parent bf125820ed4e517e412427307fa5960679e8600f

Merge bf125820ed4e517e412427307fa5960679e8600f on remote branch

Change-Id: Iaed4c703488f6a926bb1bb94cbf15fe35d3f16b1

bthost_ipc/bthost_ipc.c

diff --git a/bthost_ipc/bthost_ipc.c b/bthost_ipc/bthost_ipc.c
index d2765fd..3bafb9a 100644
--- a/bthost_ipc/bthost_ipc.c
+++ b/bthost_ipc/bthost_ipc.c
@@ -489,6 +489,8 @@
 
             p_cfg += 3; // ignoring eoc bits
             len -= 3;
+            p_cfg += APTX_ADAPTIVE_RESERVED_BITS;
+            len -= APTX_ADAPTIVE_RESERVED_BITS;
             ALOGW("%s: ## aptXAdaptive ## sampleRate 0x%x", __func__, aptx_adaptive_codec.sampling_rate);
             ALOGW("%s: ## aptXAdaptive ## channelMode 0x%x", __func__, aptx_adaptive_codec.channel_mode);
             ALOGW("%s: ## aptXAdaptive ## ttp_ll_0 0x%x", __func__, aptx_adaptive_codec.TTP_LL_low);

bthost_ipc/bthost_ipc.h

diff --git a/bthost_ipc/bthost_ipc.h b/bthost_ipc/bthost_ipc.h
index 225995d..c364ebf 100644
--- a/bthost_ipc/bthost_ipc.h
+++ b/bthost_ipc/bthost_ipc.h
@@ -99,7 +99,7 @@
     A2DP_CTRL_GET_CONNECTION_STATUS,
 } tA2DP_CTRL_EXT_CMD;
 
-#define  MAX_CODEC_CFG_SIZE  34
+#define  MAX_CODEC_CFG_SIZE  64
 struct a2dp_config {
     uint32_t                rate;
     uint32_t                channel_flags;
@@ -155,6 +155,9 @@
 #ifndef APTX_ADAPTIVE_CODEC_ID
 #define APTX_ADAPTIVE_CODEC_ID 0xAD
 #endif
+#ifndef APTX_ADAPTIVE_RESERVED_BITS
+#define APTX_ADAPTIVE_RESERVED_BITS 23
+#endif
 #ifndef APTX_TWS_CODEC_ID
 #define APTX_TWS_CODEC_ID 0x25
 #endif