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

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

[3/25] bta::dm Use stack::l2cap::get_interface() 

Bug: 343808590
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: I476ac69da7e860288507c8c82eb1ba42a10458c7
parent 53f960a8

system/bta/dm/bta_dm_act.cc

+13 −8
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ 
#include "stack/include/btm_inq.h"

#include "stack/include/btm_inq.h"

#include "stack/include/btm_status.h"

#include "stack/include/btm_status.h"

#include "stack/include/gatt_api.h"

#include "stack/include/gatt_api.h"

#include "stack/include/l2c_api.h"

#include "stack/include/l2cap_interface.h"

#include "stack/include/main_thread.h"

#include "stack/include/main_thread.h"

#include "types/bluetooth/uuid.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"

#include "types/raw_address.h"
@@ -290,11 +290,13 @@ void BTA_dm_on_hw_on() { 
void bta_dm_disable() {

void bta_dm_disable() {

  /* Set l2cap idle timeout to 0 (so BTE immediately disconnects ACL link after

  /* Set l2cap idle timeout to 0 (so BTE immediately disconnects ACL link after

   * last channel is closed) */

   * last channel is closed) */

  if (!L2CA_SetIdleTimeoutByBdAddr(RawAddress::kAny, 0, BT_TRANSPORT_BR_EDR)) {

  if (!stack::l2cap::get_interface().L2CA_SetIdleTimeoutByBdAddr(RawAddress::kAny, 0,

                                                                 BT_TRANSPORT_BR_EDR)) {

    log::warn("Unable to set L2CAP idle timeout peer:{} transport:{} timeout:{}", RawAddress::kAny,

    log::warn("Unable to set L2CAP idle timeout peer:{} transport:{} timeout:{}", RawAddress::kAny,

              BT_TRANSPORT_BR_EDR, 0);

              BT_TRANSPORT_BR_EDR, 0);

  }

  }

  if (!L2CA_SetIdleTimeoutByBdAddr(RawAddress::kAny, 0, BT_TRANSPORT_LE)) {

  if (!stack::l2cap::get_interface().L2CA_SetIdleTimeoutByBdAddr(RawAddress::kAny, 0,

                                                                 BT_TRANSPORT_LE)) {

    log::warn("Unable to set L2CAP idle timeout peer:{} transport:{} timeout:{}", RawAddress::kAny,

    log::warn("Unable to set L2CAP idle timeout peer:{} transport:{} timeout:{}", RawAddress::kAny,

              BT_TRANSPORT_LE, 0);

              BT_TRANSPORT_LE, 0);

  }

  }
@@ -1556,7 +1558,8 @@ bool bta_dm_check_if_only_hd_connected(const RawAddress& peer_addr) { 
void bta_dm_ble_set_conn_params(const RawAddress& bd_addr, uint16_t conn_int_min,

void bta_dm_ble_set_conn_params(const RawAddress& bd_addr, uint16_t conn_int_min,

                                uint16_t conn_int_max, uint16_t peripheral_latency,

                                uint16_t conn_int_max, uint16_t peripheral_latency,

                                uint16_t supervision_tout) {

                                uint16_t supervision_tout) {

  L2CA_AdjustConnectionIntervals(&conn_int_min, &conn_int_max, BTM_BLE_CONN_INT_MIN);

  stack::l2cap::get_interface().L2CA_AdjustConnectionIntervals(&conn_int_min, &conn_int_max,

                                                               BTM_BLE_CONN_INT_MIN);





  get_btm_client_interface().ble.BTM_BleSetPrefConnParams(bd_addr, conn_int_min, conn_int_max,

  get_btm_client_interface().ble.BTM_BleSetPrefConnParams(bd_addr, conn_int_min, conn_int_max,

                                                          peripheral_latency, supervision_tout);

                                                          peripheral_latency, supervision_tout);
@@ -1566,10 +1569,11 @@ void bta_dm_ble_set_conn_params(const RawAddress& bd_addr, uint16_t conn_int_min 
void bta_dm_ble_update_conn_params(const RawAddress& bd_addr, uint16_t min_int, uint16_t max_int,

void bta_dm_ble_update_conn_params(const RawAddress& bd_addr, uint16_t min_int, uint16_t max_int,

                                   uint16_t latency, uint16_t timeout, uint16_t min_ce_len,

                                   uint16_t latency, uint16_t timeout, uint16_t min_ce_len,

                                   uint16_t max_ce_len) {

                                   uint16_t max_ce_len) {

  L2CA_AdjustConnectionIntervals(&min_int, &max_int, BTM_BLE_CONN_INT_MIN);

  stack::l2cap::get_interface().L2CA_AdjustConnectionIntervals(&min_int, &max_int,

                                                               BTM_BLE_CONN_INT_MIN);





  if (!L2CA_UpdateBleConnParams(bd_addr, min_int, max_int, latency, timeout, min_ce_len,

  if (!stack::l2cap::get_interface().L2CA_UpdateBleConnParams(bd_addr, min_int, max_int, latency,

                                max_ce_len)) {

                                                              timeout, min_ce_len, max_ce_len)) {

    log::error("Update connection parameters failed!");

    log::error("Update connection parameters failed!");

  }

  }

}

}
@@ -1872,7 +1876,8 @@ void bta_dm_ble_subrate_request(const RawAddress& bd_addr, uint16_t subrate_min, 
                                uint16_t subrate_max, uint16_t max_latency, uint16_t cont_num,

                                uint16_t subrate_max, uint16_t max_latency, uint16_t cont_num,

                                uint16_t timeout) {

                                uint16_t timeout) {

  // Logging done in l2c_ble.cc

  // Logging done in l2c_ble.cc

  if (!L2CA_SubrateRequest(bd_addr, subrate_min, subrate_max, max_latency, cont_num, timeout)) {

  if (!stack::l2cap::get_interface().L2CA_SubrateRequest(bd_addr, subrate_min, subrate_max,

                                                         max_latency, cont_num, timeout)) {

    log::warn("Unable to set L2CAP ble subrating peer:{}", bd_addr);

    log::warn("Unable to set L2CAP ble subrating peer:{}", bd_addr);

  }

  }

}

}