summaryrefslogtreecommitdiffstats
path: root/stack/sdp/sdp_main.c
diff options
context:
space:
mode:
authorSharvil Nanavati <sharvil@google.com>2014-12-29 10:24:15 -0800
committerAndre Eisenbach <eisenbach@google.com>2015-03-16 16:51:42 -0700
commit24ff5af9e40aaebc236bb6a16849c63bff0f23ba (patch)
tree38f1362962b906d4a5575504120e01830a5471f8 /stack/sdp/sdp_main.c
parenta330b102cc2f0b87919ff457563a3a722a73dd67 (diff)
downloadandroid_system_bt-24ff5af9e40aaebc236bb6a16849c63bff0f23ba.tar.gz
android_system_bt-24ff5af9e40aaebc236bb6a16849c63bff0f23ba.tar.bz2
android_system_bt-24ff5af9e40aaebc236bb6a16849c63bff0f23ba.zip
Collapse more feature flags.
Start reviewing in include/bt_target.h.
Diffstat (limited to 'stack/sdp/sdp_main.c')
-rw-r--r--stack/sdp/sdp_main.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/stack/sdp/sdp_main.c b/stack/sdp/sdp_main.c
index 1e0c22a3c..86f16fbeb 100644
--- a/stack/sdp/sdp_main.c
+++ b/stack/sdp/sdp_main.c
@@ -563,12 +563,6 @@ tCONN_CB* sdp_conn_originate (UINT8 *p_bd_addr)
/* Transition to the next appropriate state, waiting for connection confirm. */
p_ccb->con_state = SDP_STATE_CONN_SETUP;
-// btla-specific ++
-#ifndef ANDROID_APP_INCLUDED /* Skip for Android: Do not need to set out_service for sdp, since sdp does not use sec. Prevents over-writing service_rec of a connection already in progress */
- BTM_SetOutService(p_bd_addr, BTM_SEC_SERVICE_SDP_SERVER, 0);
-#endif
-// btla-specific --
-
cid = L2CA_ConnectReq (SDP_PSM, p_bd_addr);
/* Check if L2CAP started the connection process */