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

Commit 825374ca authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Get rid of selective connection procedure 

Bug: 30622771
Test: compilation test
Change-Id: I1a7e4c49f93f11a350b96ffe7b2e69974ed82f46
parent 00d660bd

system/bta/dm/bta_dm_act.cc

+1 −2
Original line number Diff line number Diff line
@@ -4226,8 +4226,7 @@ void bta_dm_security_grant(tBTA_DM_MSG* p_data) { 
 *

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

void bta_dm_ble_set_bg_conn_type(tBTA_DM_MSG* p_data) {

  BTM_BleSetBgConnType(p_data->ble_set_bd_conn_type.bg_conn_type,

                       p_data->ble_set_bd_conn_type.p_select_cback);

  BTM_BleStartAutoConn();

}



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

system/bta/dm/bta_dm_api.cc

+6 −23
Original line number Diff line number Diff line
@@ -1003,31 +1003,14 @@ extern void BTA_DmBleTrackAdvertiser( 
 *                      BLE ADV data management API

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



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

 *

 * Function         BTA_DmBleSetBgConnType

 *

 * Description      This function is called to set BLE connectable mode for a

 *                  peripheral device.

 *

 * Parameters       bg_conn_type: it can be auto connection, or selective

 *                                connection.

 *                  p_select_cback: callback function when selective connection

 *                                  procedure is being used.

 *

 * Returns          void

 *

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

void BTA_DmBleSetBgConnType(tBTA_DM_BLE_CONN_TYPE bg_conn_type,

                            tBTA_DM_BLE_SEL_CBACK* p_select_cback) {

  tBTA_DM_API_BLE_SET_BG_CONN_TYPE* p_msg =

      (tBTA_DM_API_BLE_SET_BG_CONN_TYPE*)osi_calloc(

          sizeof(tBTA_DM_API_BLE_SET_BG_CONN_TYPE));

/**

 * Set BLE connectable mode to auto connect

 */

void BTA_DmBleStartAutoConn() {

  tBTA_DM_API_SET_NAME* p_msg =

      (tBTA_DM_API_SET_NAME*)osi_calloc(sizeof(tBTA_DM_API_SET_NAME));



  p_msg->hdr.event = BTA_DM_API_BLE_SET_BG_CONN_TYPE;

  p_msg->bg_conn_type = bg_conn_type;

  p_msg->p_select_cback = p_select_cback;



  bta_sys_sendmsg(p_msg);

}

system/bta/dm/bta_dm_int.h

+0 −7
Original line number Diff line number Diff line
@@ -362,12 +362,6 @@ typedef struct { 
  tBTA_DM_BLE_SEC_GRANT res;

} tBTA_DM_API_BLE_SEC_GRANT;



typedef struct {

  BT_HDR hdr;

  tBTA_DM_BLE_CONN_TYPE bg_conn_type;

  tBTA_DM_BLE_SEL_CBACK* p_select_cback;

} tBTA_DM_API_BLE_SET_BG_CONN_TYPE;



/* set prefered BLE connection parameters for a device */

typedef struct {

  BT_HDR hdr;
@@ -580,7 +574,6 @@ typedef union { 
  tBTA_DM_API_ADD_BLE_DEVICE add_ble_device;

  tBTA_DM_API_PASSKEY_REPLY ble_passkey_reply;

  tBTA_DM_API_BLE_SEC_GRANT ble_sec_grant;

  tBTA_DM_API_BLE_SET_BG_CONN_TYPE ble_set_bd_conn_type;

  tBTA_DM_API_BLE_CONN_PARAMS ble_set_conn_params;

  tBTA_DM_API_BLE_CONN_SCAN_PARAMS ble_set_conn_scan_params;

  tBTA_DM_API_BLE_SCAN_PARAMS ble_set_scan_params;

system/bta/hh/bta_hh_le.cc

+1 −1
Original line number Diff line number Diff line
@@ -2125,7 +2125,7 @@ static void bta_hh_le_add_dev_bg_conn(tBTA_HH_DEV_CB* p_cb, bool check_bond) { 
    BTA_GATTC_Open(bta_hh_cb.gatt_if, p_cb->addr, false, BTA_GATT_TRANSPORT_LE);

    p_cb->in_bg_conn = true;



    BTA_DmBleSetBgConnType(BTA_DM_BLE_CONN_AUTO, NULL);

    BTA_DmBleStartAutoConn();

  }

  return;

}

system/bta/include/bta_api.h

+4 −24
Original line number Diff line number Diff line
@@ -594,13 +594,6 @@ typedef struct { 
#define BTA_DM_SEC_REP_ATTEMPTS BTA_DM_AUTH_SMP_REPEATED_ATTEMPT

typedef uint8_t tBTA_DM_BLE_SEC_GRANT;



#define BTA_DM_BLE_ONN_NONE BTM_BLE_CONN_NONE

#define BTA_DM_BLE_CONN_AUTO BTM_BLE_CONN_AUTO

#define BTA_DM_BLE_CONN_SELECTIVE BTM_BLE_CONN_SELECTIVE

typedef uint8_t tBTA_DM_BLE_CONN_TYPE;



typedef bool(tBTA_DM_BLE_SEL_CBACK)(BD_ADDR random_bda, uint8_t* p_remote_name);



/* Structure associated with BTA_DM_BLE_SEC_REQ_EVT */

typedef struct {

  BD_ADDR bd_addr; /* peer address */
@@ -1600,23 +1593,10 @@ extern int32_t BTA_DmPcmResample(void* p_src, uint32_t in_bytes, void* p_dst); 
 ******************************************************************************/

extern void BTA_DmBleSecurityGrant(BD_ADDR bd_addr, tBTA_DM_BLE_SEC_GRANT res);



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

 *

 * Function         BTA_DmBleSetBgConnType

 *

 * Description      This function is called to set BLE connectable mode for a

 *                  peripheral device.

 *

 * Parameters       bg_conn_type: it can be auto connection, or selective

 *                                connection.

 *                  p_select_cback: callback function when selective connection

 *                                  procedure is being used.

 *

 * Returns          void

 *

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

extern void BTA_DmBleSetBgConnType(tBTA_DM_BLE_CONN_TYPE bg_conn_type,

                                   tBTA_DM_BLE_SEL_CBACK* p_select_cback);

/**

 * Set BLE connectable mode to auto connect

 */

extern void BTA_DmBleStartAutoConn();



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

 *