OSDN Git Service

Do not enable A2DP sink by default
authorAndre Eisenbach <eisenbach@google.com>
Mon, 25 Jan 2016 22:21:21 +0000 (14:21 -0800)
committerAndre Eisenbach <eisenbach@google.com>
Tue, 26 Jan 2016 15:13:48 +0000 (07:13 -0800)
Bug: 26742931
Change-Id: I70b1fdcd72abae2712e37f49ecb588901998cc12

bta/av/bta_av_act.c
include/bt_target.h

index 1310a26..c125d32 100644 (file)
@@ -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);
index fae7d47..e210674 100644 (file)
@@ -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