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

Commit d8344d6d authored by Chris Manton's avatar Chris Manton
Browse files

mock: [8/63] Remove BTM_BleSetPrefConnParams 

Use get_btm_client_interface() instead

Bug: 352129816
Test: m .
Flag: EXEMPT, Test infrastructure

Change-Id: I6610625b0d3a7e395a2c40fd07121d52d9cf7485
parent edb499a7

system/bta/hh/bta_hh_le.cc

+3 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "stack/include/bt_hdr.h"

#include "stack/include/bt_types.h"

#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/l2c_api.h"  // L2CA_

#include "stack/include/main_thread.h"
@@ -1395,8 +1396,8 @@ static void read_pref_conn_params_cb(uint16_t conn_id, tGATT_STATUS status, uint 
    latency = 0;

  }



  BTM_BleSetPrefConnParams(p_dev_cb->link_spec.addrt.bda, min_interval, max_interval, latency,

                           timeout);

  get_btm_client_interface().ble.BTM_BleSetPrefConnParams(

          p_dev_cb->link_spec.addrt.bda, min_interval, max_interval, latency, timeout);

  if (!L2CA_UpdateBleConnParams(p_dev_cb->link_spec.addrt.bda, min_interval, max_interval, latency,

                                timeout, 0, 0)) {

    log::warn("Unable to update L2CAP ble connection params peer:{}",

system/stack/gap/gap_ble.cc

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ void client_cmpl_cback(uint16_t conn_id, tGATTC_OPTYPE op, tGATT_STATUS status, 
      STREAM_TO_UINT16(latency, pp);

      STREAM_TO_UINT16(tout, pp);



      BTM_BleSetPrefConnParams(p_clcb->bda, min, max, latency, tout);

      get_btm_client_interface().ble.BTM_BleSetPrefConnParams(p_clcb->bda, min, max, latency, tout);

      /* release the connection here */

      cl_op_cmpl(*p_clcb, true, 0, NULL);

      break;

system/test/mock/mock_stack_btm_ble.cc

+0 −8
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ struct BTM_BlePasskeyReply BTM_BlePasskeyReply; 
struct BTM_BleReadPhy BTM_BleReadPhy;

struct BTM_BleReceiverTest BTM_BleReceiverTest;

struct BTM_BleSecureConnectionOobDataReply BTM_BleSecureConnectionOobDataReply;

struct BTM_BleSetPrefConnParams BTM_BleSetPrefConnParams;

struct BTM_BleTestEnd BTM_BleTestEnd;

struct BTM_BleTransmitterTest BTM_BleTransmitterTest;

struct BTM_BleVerifySignature BTM_BleVerifySignature;
@@ -154,13 +153,6 @@ void BTM_BleSecureConnectionOobDataReply(const RawAddress& bd_addr, uint8_t* p_c 
  inc_func_call_count(__func__);

  test::mock::stack_btm_ble::BTM_BleSecureConnectionOobDataReply(bd_addr, p_c, p_r);

}

void BTM_BleSetPrefConnParams(const RawAddress& bd_addr, uint16_t min_conn_int,

                              uint16_t max_conn_int, uint16_t peripheral_latency,

                              uint16_t supervision_tout) {

  inc_func_call_count(__func__);

  test::mock::stack_btm_ble::BTM_BleSetPrefConnParams(bd_addr, min_conn_int, max_conn_int,

                                                      peripheral_latency, supervision_tout);

}

void BTM_BleTestEnd(tBTM_CMPL_CB* p_cmd_cmpl_cback) {

  inc_func_call_count(__func__);

  test::mock::stack_btm_ble::BTM_BleTestEnd(p_cmd_cmpl_cback);

system/test/mock/mock_stack_btm_ble.h

+0 −17
Original line number Diff line number Diff line
@@ -151,23 +151,6 @@ struct BTM_BleSecureConnectionOobDataReply { 
};

extern struct BTM_BleSecureConnectionOobDataReply BTM_BleSecureConnectionOobDataReply;



// Name: BTM_BleSetPrefConnParams

// Params: const RawAddress& bd_addr, uint16_t min_conn_int, uint16_t

// max_conn_int, uint16_t peripheral_latency, uint16_t supervision_tout Return:

// void

struct BTM_BleSetPrefConnParams {

  std::function<void(const RawAddress& bd_addr, uint16_t min_conn_int, uint16_t max_conn_int,

                     uint16_t peripheral_latency, uint16_t supervision_tout)>

          body{[](const RawAddress& /* bd_addr */, uint16_t /* min_conn_int */,

                  uint16_t /* max_conn_int */, uint16_t /* peripheral_latency */,

                  uint16_t /* supervision_tout */) {}};

  void operator()(const RawAddress& bd_addr, uint16_t min_conn_int, uint16_t max_conn_int,

                  uint16_t peripheral_latency, uint16_t supervision_tout) {

    body(bd_addr, min_conn_int, max_conn_int, peripheral_latency, supervision_tout);

  }

};

extern struct BTM_BleSetPrefConnParams BTM_BleSetPrefConnParams;



// Name: BTM_BleTestEnd

// Params: tBTM_CMPL_CB* p_cmd_cmpl_cback

// Return: void