From e273daa4af2aa49ed23c172387ada70938c2130e Mon Sep 17 00:00:00 2001 From: Andre Eisenbach Date: Mon, 25 Jan 2016 14:21:21 -0800 Subject: [PATCH] Do not enable A2DP sink by default Bug: 26742931 Change-Id: I70b1fdcd72abae2712e37f49ecb588901998cc12 --- bta/av/bta_av_act.c | 5 ++++- include/bt_target.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bta/av/bta_av_act.c b/bta/av/bta_av_act.c index 1310a26b5..c125d328a 100644 --- a/bta/av/bta_av_act.c +++ b/bta/av/bta_av_act.c @@ -1850,6 +1850,7 @@ void bta_av_rc_disc_done(tBTA_AV_DATA *p_data) } APPL_TRACE_DEBUG("%s rc_handle %d", __FUNCTION__, rc_handle); +#if (BTA_AV_SINK_INCLUDED == TRUE) if (p_cb->sdp_a2d_snk_handle) { /* This is Sink + CT + TG(Abs Vol) */ @@ -1857,7 +1858,9 @@ void bta_av_rc_disc_done(tBTA_AV_DATA *p_data) if (BTA_AV_FEAT_ADV_CTRL & bta_avk_check_peer_features(UUID_SERVCLASS_AV_REMOTE_CONTROL)) peer_features |= (BTA_AV_FEAT_ADV_CTRL|BTA_AV_FEAT_RCCT); } - else if (p_cb->sdp_a2d_handle) + else +#endif + if (p_cb->sdp_a2d_handle) { /* check peer version and whether support CT and TG role */ peer_features = bta_av_check_peer_features(UUID_SERVCLASS_AV_REMOTE_CONTROL); diff --git a/include/bt_target.h b/include/bt_target.h index fae7d4756..e210674f4 100644 --- a/include/bt_target.h +++ b/include/bt_target.h @@ -87,7 +87,7 @@ #endif #ifndef BTA_AV_SINK_INCLUDED -#define BTA_AV_SINK_INCLUDED TRUE +#define BTA_AV_SINK_INCLUDED FALSE #endif #ifndef BTA_DISABLE_DELAY -- 2.11.0