From: Zach Johnson <zachoverflow@google.com>
Date: Tue, 25 Aug 2020 22:29:36 +0000 (-0700)
Subject: Inline avdt security
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=462e97b4671371d42a1c54f54ed076a3a381610b;p=android-x86%2Fsystem-bt.git

Inline avdt security

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ida0979e58c52d98268ad6b7741022168cd58af14
---

diff --git a/stack/avdt/avdt_ad.cc b/stack/avdt/avdt_ad.cc
index 0568eb217..fe0b838b9 100644
--- a/stack/avdt/avdt_ad.cc
+++ b/stack/avdt/avdt_ad.cc
@@ -551,10 +551,9 @@ void avdt_ad_open_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb,
   else {
     p_tbl->state = AVDT_AD_ST_CONN;
 
-    BTM_SetOutService(p_ccb->peer_addr, BTM_SEC_SERVICE_AVDTP, type);
-
     /* call l2cap connect req */
-    lcid = L2CA_ConnectReq(AVDT_PSM, p_ccb->peer_addr);
+    lcid =
+        L2CA_ConnectReq2(AVDT_PSM, p_ccb->peer_addr, BTM_SEC_OUT_AUTHENTICATE);
     if (lcid != 0) {
       /* if connect req ok, store tcid in lcid table  */
       avdtp_cb.ad.lcid_tbl[lcid - L2CAP_BASE_APPL_CID] =
diff --git a/stack/avdt/avdt_api.cc b/stack/avdt/avdt_api.cc
index 33a4e41a8..857c8d532 100644
--- a/stack/avdt/avdt_api.cc
+++ b/stack/avdt/avdt_api.cc
@@ -91,10 +91,9 @@ void avdt_scb_transport_channel_timer_timeout(void* data) {
  ******************************************************************************/
 void AVDT_Register(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback) {
   /* register PSM with L2CAP */
-  L2CA_Register(AVDT_PSM, (tL2CAP_APPL_INFO*)&avdt_l2c_appl,
-                true /* enable_snoop */, nullptr, L2CAP_DEFAULT_MTU);
-
-  BTM_SimpleSetSecurityLevel(BTM_SEC_SERVICE_AVDTP, p_reg->sec_mask, AVDT_PSM);
+  L2CA_Register2(AVDT_PSM, (tL2CAP_APPL_INFO*)&avdt_l2c_appl,
+                 true /* enable_snoop */, nullptr, L2CAP_DEFAULT_MTU,
+                 p_reg->sec_mask);
 
   /* initialize AVDTP data structures */
   avdt_scb_init();
diff --git a/stack/avdt/avdt_ccb_act.cc b/stack/avdt/avdt_ccb_act.cc
index 4fefb2f94..b424fd558 100644
--- a/stack/avdt/avdt_ccb_act.cc
+++ b/stack/avdt/avdt_ccb_act.cc
@@ -940,10 +940,6 @@ void avdt_ccb_chk_timer(AvdtpCcb* p_ccb, UNUSED_ATTR tAVDT_CCB_EVT* p_data) {
 void avdt_ccb_set_conn(AvdtpCcb* p_ccb, tAVDT_CCB_EVT* p_data) {
   /* save callback */
   p_ccb->p_conn_cback = p_data->connect.p_cback;
-
-  /* set security level */
-  BTM_SetSecurityLevel(true, "", BTM_SEC_SERVICE_AVDTP,
-                       BTM_SEC_OUT_AUTHENTICATE, AVDT_PSM, 0, 0);
 }
 
 /*******************************************************************************