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

Commit 91da388b authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge "Fix a potential ODR vialation" into main

parents 0b013c54 ebeec7e1

system/internal_include/bt_target.h

+3 −3
Original line number Diff line number Diff line
@@ -370,9 +370,9 @@ 
#endif



/* Used for conformance testing ONLY */

#ifndef BTM_BLE_CONFORMANCE_TESTING

#define BTM_BLE_CONFORMANCE_TESTING FALSE

#endif

// uncomment the following line to enable

// conformance testing

// #define BTM_BLE_CONFORMANCE_TESTING



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

 *

system/stack/btm/btm_ble.cc

+3 −3
Original line number Diff line number Diff line
@@ -1596,7 +1596,7 @@ uint8_t btm_ble_io_capabilities_req(tBTM_SEC_DEV_REC* p_dev_rec, 
        BTM_LE_IO_REQ_EVT, p_dev_rec->bd_addr, (tBTM_LE_EVT_DATA*)p_data);

  }

  if ((callback_rc == BTM_SUCCESS) || (BTM_OOB_UNKNOWN != p_data->oob_data)) {

#if (BTM_BLE_CONFORMANCE_TESTING == TRUE)

#ifdef BTM_BLE_CONFORMANCE_TESTING

    if (btm_cb.devcb.keep_rfu_in_auth_req) {

      LOG_VERBOSE("btm_ble_io_capabilities_req keep_rfu_in_auth_req = %u",

                  btm_cb.devcb.keep_rfu_in_auth_req);
@@ -1821,7 +1821,7 @@ tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, 
            LOG_VERBOSE("Pairing Cancel completed");

            (*btm_sec_cb.api.p_bond_cancel_cmpl_callback)(BTM_SUCCESS);

          }

#if (BTM_BLE_CONFORMANCE_TESTING == TRUE)

#ifdef BTM_BLE_CONFORMANCE_TESTING

          if (res != BTM_SUCCESS) {

            if (!btm_cb.devcb.no_disc_if_pair_fail &&

                p_data->cmplt.reason != SMP_CONN_TOUT) {
@@ -2180,7 +2180,7 @@ bool btm_ble_get_acl_remote_addr(uint16_t hci_handle, RawAddress& conn_addr, 
  return st;

}



#if BTM_BLE_CONFORMANCE_TESTING == TRUE

#ifdef BTM_BLE_CONFORMANCE_TESTING

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

 *

 * Function         btm_ble_set_no_disc_if_pair_fail

system/stack/btm/btm_ble_int.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ bool btm_ble_set_topology_mask(tBTM_BLE_STATE_MASK request_state); 
void btm_ble_scanner_init(void);

void btm_ble_scanner_cleanup(void);



#if (BTM_BLE_CONFORMANCE_TESTING == TRUE)

#ifdef BTM_BLE_CONFORMANCE_TESTING

void btm_ble_set_no_disc_if_pair_fail(bool disble_disc);

void btm_ble_set_test_mac_value(bool enable, uint8_t* p_test_mac_val);

void btm_ble_set_test_local_sign_cntr_value(bool enable,

system/stack/btm/btm_sec_int_types.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ typedef struct tBTM_SEC_DEVCB { 
  tBTM_BLE_LOCAL_ID_KEYS id_keys;   /* local BLE ID keys */

  Octet16 ble_encryption_key_value; /* BLE encryption key */



#if (BTM_BLE_CONFORMANCE_TESTING == TRUE)

#ifdef BTM_BLE_CONFORMANCE_TESTING

  bool no_disc_if_pair_fail;

  bool enable_test_mac_val;

  BT_OCTET8 test_mac;