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

Commit ef1730ea authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

Clean up L2CA_UpdateBleConnParams am: 4b28b43e am: 7e5dead8 am: ec0cb9b1 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1548874

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I096f54642494af874d5ed2d9777b05264ede976a
parents a569e92f ec0cb9b1

system/bta/hh/bta_hh_le.cc

+1 −1
Original line number Diff line number Diff line
@@ -1359,7 +1359,7 @@ void read_pref_conn_params_cb(uint16_t conn_id, tGATT_STATUS status, 
  BTM_BleSetPrefConnParams(p_dev_cb->addr, min_interval, max_interval, latency,

                           timeout);

  L2CA_UpdateBleConnParams(p_dev_cb->addr, min_interval, max_interval, latency,

                           timeout);

                           timeout, 0, 0);

}



/*******************************************************************************

system/main/shim/l2c_api.cc

+7 −4
Original line number Diff line number Diff line
@@ -968,16 +968,19 @@ uint16_t L2CA_GetLeHandle(uint16_t cid, const RawAddress& rem_bda) { 
  return channel->second->GetLinkOptions()->GetHandle();

}



void L2CA_LeConnectionUpdate(const RawAddress& rem_bda) {

  auto* helper = &le_fixed_channel_helper_.find(4)->second;

void L2CA_LeConnectionUpdate(const RawAddress& rem_bda, uint16_t min_int,

                             uint16_t max_int, uint16_t latency,

                             uint16_t timeout, uint16_t min_ce_len,

                             uint16_t max_ce_len) {

  auto* helper = &le_fixed_channel_helper_.find(kAttCid)->second;

  auto remote = ToAddressWithType(rem_bda, Btm::GetAddressType(rem_bda));

  auto channel = helper->channels_.find(remote);

  if (channel == helper->channels_.end() || channel->second == nullptr) {

    LOG(ERROR) << "Channel is not open";

  }



  channel->second->GetLinkOptions()->UpdateConnectionParameter(0x24, 0x24, 0,

                                                               0x01f4, 0, 0);

  channel->second->GetLinkOptions()->UpdateConnectionParameter(

      min_int, max_int, latency, timeout, min_ce_len, max_ce_len);

}



/**

system/main/shim/l2c_api.h

+5 −1
Original line number Diff line number Diff line
@@ -394,7 +394,11 @@ uint16_t L2CA_SendFixedChnlData(uint16_t fixed_cid, const RawAddress& rem_bda, 
bool L2CA_RemoveFixedChnl(uint16_t fixed_cid, const RawAddress& rem_bda);



uint16_t L2CA_GetLeHandle(uint16_t cid, const RawAddress& rem_bda);

void L2CA_LeConnectionUpdate(const RawAddress& rem_bda);



void L2CA_LeConnectionUpdate(const RawAddress& rem_bda, uint16_t min_int,

                             uint16_t max_int, uint16_t latency,

                             uint16_t timeout, uint16_t min_ce_len,

                             uint16_t max_ce_len);



/*******************************************************************************

 *

system/stack/include/l2c_api.h

+0 −14
Original line number Diff line number Diff line
@@ -772,20 +772,6 @@ extern bool L2CA_SetFixedChannelTout(const RawAddress& rem_bda, 
 ******************************************************************************/

extern bool L2CA_CancelBleConnectReq(const RawAddress& rem_bda);



/*******************************************************************************

 *

 *  Function        L2CA_UpdateBleConnParams

 *

 *  Description     Update BLE connection parameters.

 *

 *  Parameters:     BD Address of remote

 *

 *  Return value:   true if update started

 *

 ******************************************************************************/

extern bool L2CA_UpdateBleConnParams(const RawAddress& rem_bdRa,

                                     uint16_t min_int, uint16_t max_int,

                                     uint16_t latency, uint16_t timeout);

extern bool L2CA_UpdateBleConnParams(const RawAddress& rem_bda,

                                     uint16_t min_int, uint16_t max_int,

                                     uint16_t latency, uint16_t timeout,

system/stack/l2cap/l2c_ble.cc

+4 −10
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ bool L2CA_UpdateBleConnParams(const RawAddress& rem_bda, uint16_t min_int, 
                              uint16_t timeout, uint16_t min_ce_len,

                              uint16_t max_ce_len) {

  if (bluetooth::shim::is_gd_l2cap_enabled()) {

    bluetooth::shim::L2CA_LeConnectionUpdate(rem_bda);

    bluetooth::shim::L2CA_LeConnectionUpdate(rem_bda, min_int, max_int, latency,

                                             timeout, min_ce_len, max_ce_len);

    return true;

  }
@@ -142,13 +143,6 @@ bool L2CA_UpdateBleConnParams(const RawAddress& rem_bda, uint16_t min_int, 
  return (true);

}



bool L2CA_UpdateBleConnParams(const RawAddress& rem_bda, uint16_t min_int,

                              uint16_t max_int, uint16_t latency,

                              uint16_t timeout) {

  return L2CA_UpdateBleConnParams(rem_bda, min_int, max_int, latency, timeout,

                                  0, 0);

}



/*******************************************************************************

 *

 *  Function        L2CA_EnableUpdateBleConnParams
@@ -161,8 +155,8 @@ bool L2CA_UpdateBleConnParams(const RawAddress& rem_bda, uint16_t min_int, 
 *

 ******************************************************************************/

bool L2CA_EnableUpdateBleConnParams(const RawAddress& rem_bda, bool enable) {

  if (bluetooth::shim::is_gd_l2cap_enabled() && enable) {

    bluetooth::shim::L2CA_LeConnectionUpdate(rem_bda);

  if (bluetooth::shim::is_gd_l2cap_enabled()) {

    // TODO(hsz): Implement me

    return true;

  }