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

Commit 4e60a612 authored by Stanley Tng's avatar Stanley Tng Committed by Gerrit Code Review
Browse files

Merge "Pass new LE CoC min_ce/max_ce parameters to native stack"

parents 7ebb85a9 f61988fe

system/binder/android/bluetooth/IBluetoothGatt.aidl

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ interface IBluetoothGatt { 
    void configureMTU(in int clientIf, in String address, in int mtu);

    void connectionParameterUpdate(in int clientIf, in String address, in int connectionPriority);

    void leConnectionUpdate(int clientIf, String address, int minInterval,

                            int maxInterval, int slaveLatency, int supervisionTimeout);

                            int maxInterval, int slaveLatency, int supervisionTimeout,

                            int minConnectionEventLen, int maxConnectionEventLen);



    void registerServer(in ParcelUuid appId, in IBluetoothGattServerCallback callback);

    void unregisterServer(in int serverIf);

system/bta/dm/bta_dm_act.cc

+4 −2
Original line number Diff line number Diff line
@@ -3971,8 +3971,10 @@ void bta_dm_ble_set_conn_scan_params(uint32_t scan_interval, 
/** This function update LE connection parameters */

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) {

  if (!L2CA_UpdateBleConnParams(bd_addr, min_int, max_int, latency, timeout)) {

                                   uint16_t timeout, uint16_t min_ce_len,

                                   uint16_t max_ce_len) {

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

                                min_ce_len, max_ce_len)) {

    APPL_TRACE_ERROR("Update connection parameters failed!");

  }

}

system/bta/dm/bta_dm_api.cc

+5 −3
Original line number Diff line number Diff line
@@ -727,9 +727,11 @@ void BTA_DmSearchExt(tBTA_DM_INQ* p_dm_inq, tBTA_SERVICE_MASK_EXT* p_services, 
 ******************************************************************************/

void BTA_DmBleUpdateConnectionParams(const RawAddress& bd_addr,

                                     uint16_t min_int, uint16_t max_int,

                                     uint16_t latency, uint16_t timeout) {

  do_in_bta_thread(FROM_HERE, base::Bind(bta_dm_ble_update_conn_params, bd_addr,

                                         min_int, max_int, latency, timeout));

                                     uint16_t latency, uint16_t timeout,

                                     uint16_t min_ce_len, uint16_t max_ce_len) {

  do_in_bta_thread(

      FROM_HERE, base::Bind(bta_dm_ble_update_conn_params, bd_addr, min_int,

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

}



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

system/bta/dm/bta_dm_int.h

+2 −1
Original line number Diff line number Diff line
@@ -507,7 +507,8 @@ extern void bta_dm_ble_set_conn_scan_params(uint32_t, uint32_t); 
extern void bta_dm_close_gatt_conn(tBTA_DM_MSG* p_data);

extern void bta_dm_ble_observe(bool, uint8_t, tBTA_DM_SEARCH_CBACK*);

extern void bta_dm_ble_update_conn_params(const RawAddress&, uint16_t, uint16_t,

                                          uint16_t, uint16_t);

                                          uint16_t, uint16_t, uint16_t,

                                          uint16_t);

extern void bta_dm_ble_config_local_privacy(bool);

extern void bta_dm_ble_set_adv_params(uint16_t adv_int_min,

                                      uint16_t adv_int_max,

system/bta/include/bta_api.h

+3 −1
Original line number Diff line number Diff line
@@ -1648,7 +1648,9 @@ extern void BTA_DmBleEnableRemotePrivacy(const RawAddress& bd_addr, 
 ******************************************************************************/

extern void BTA_DmBleUpdateConnectionParams(const RawAddress& bd_addr,

                                            uint16_t min_int, uint16_t max_int,

                                            uint16_t latency, uint16_t timeout);

                                            uint16_t latency, uint16_t timeout,

                                            uint16_t min_ce_len,

                                            uint16_t max_ce_len);



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

 *