Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc89d8a7 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "[Invisalign2] Remove l2c_link_sec_comp2" into main am: 66e59d78 am:... 

Merge "[Invisalign2] Remove l2c_link_sec_comp2" into main am: 66e59d78 am: cab16d97 am: ad230bf7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2848854



Change-Id: I7c96218f9b7bd0d2097701ea9446ad2b099eba34
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12cb4a21 ad230bf7

system/stack/l2cap/l2c_int.h

+0 −2
Original line number Diff line number Diff line
@@ -814,8 +814,6 @@ void l2c_link_adjust_allocation(void); 


void l2c_link_sec_comp(const RawAddress* p_bda, tBT_TRANSPORT trasnport,

                       void* p_ref_data, tBTM_STATUS status);

void l2c_link_sec_comp2(const RawAddress& p_bda, tBT_TRANSPORT trasnport,

                        void* p_ref_data, tBTM_STATUS status);

void l2c_link_adjust_chnl_allocation(void);



#if (L2CAP_CONFORMANCE_TESTING == TRUE)

system/stack/l2cap/l2c_link.cc

+4 −11
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ 
#include "device/include/device_iot_config.h"

#include "main/shim/l2c_api.h"

#include "main/shim/shim.h"

#include "os/log.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/btm/btm_int_types.h"

#include "stack/include/acl_api.h"
@@ -182,19 +182,13 @@ void l2c_link_hci_conn_comp(tHCI_STATUS status, uint16_t handle, 
void l2c_link_sec_comp(const RawAddress* p_bda,

                       UNUSED_ATTR tBT_TRANSPORT transport, void* p_ref_data,

                       tBTM_STATUS status) {

  l2c_link_sec_comp2(*p_bda, transport, p_ref_data, status);

}



void l2c_link_sec_comp2(const RawAddress& p_bda,

                        UNUSED_ATTR tBT_TRANSPORT transport, void* p_ref_data,

                        tBTM_STATUS status) {

  tL2C_CONN_INFO ci;

  tL2C_LCB* p_lcb;

  tL2C_CCB* p_ccb;

  tL2C_CCB* p_next_ccb;



  LOG_DEBUG("btm_status=%s, BD_ADDR=%s, transport=%s",

            btm_status_text(status).c_str(), ADDRESS_TO_LOGGABLE_CSTR(p_bda),

            btm_status_text(status).c_str(), ADDRESS_TO_LOGGABLE_CSTR(*p_bda),

            bt_transport_text(transport).c_str());



  if (status == BTM_SUCCESS_NO_SECURITY) {
@@ -203,9 +197,9 @@ void l2c_link_sec_comp2(const RawAddress& p_bda, 


  /* Save the parameters */

  ci.status = status;

  ci.bd_addr = p_bda;

  ci.bd_addr = *p_bda;



  p_lcb = l2cu_find_lcb_by_bd_addr(p_bda, transport);

  p_lcb = l2cu_find_lcb_by_bd_addr(*p_bda, transport);



  /* If we don't have one, this is an error */

  if (!p_lcb) {
@@ -235,7 +229,6 @@ void l2c_link_sec_comp2(const RawAddress& p_bda, 
          l2c_csm_execute(p_ccb, L2CEVT_SEC_COMP_NEG, &ci);

          break;

      }

      break;

    }

  }

}

system/test/mock/mock_stack_l2cap_link.cc

+1 −5
Original line number Diff line number Diff line
@@ -69,11 +69,7 @@ void l2c_link_sec_comp(const RawAddress* /* p_bda */, 
                       uint8_t /* status */) {

  inc_func_call_count(__func__);

}

void l2c_link_sec_comp2(const RawAddress& /* p_bda */,

                        tBT_TRANSPORT /* transport */, void* /* p_ref_data */,

                        uint8_t /* status */) {

  inc_func_call_count(__func__);

}



void l2c_link_segments_xmitted(BT_HDR* /* p_msg */) {

  inc_func_call_count(__func__);

}